mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

libgpg-error: upgrade 1.39 -> 1.41

Browse Source 
refresh pkgconfig.patch

(From OE-Core rev: 0de14edfd16dc25d8a0dc0da120cda955dcc7576)

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
zhengruoqin
2021-01-14 15:00:50 +08:00
committed by Richard Purdie
parent 24087b9564
commit 90288f32db
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
+16 -15
View File
@@ -11,18 +11,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Refactored for 1.33 Refactored for 1.33
Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
--- ---
configure.ac | 1 + src/gpg-error.m4 | 142 +----------------------------------------------
src/gpg-error.m4 | 71 +++-------------------------------------------------- 1 file changed, 3 insertions(+), 139 deletions(-)
4 files changed, 18 insertions(+), 69 deletions(-)
create mode 100644 src/gpg-error.pc.in
Index: libgpg-error-1.33/src/gpg-error.m4 diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
=================================================================== index c9b235f..176bd6a 100644
--- libgpg-error-1.33.orig/src/gpg-error.m4 --- a/src/gpg-error.m4
+++ libgpg-error-1.33/src/gpg-error.m4 +++ b/src/gpg-error.m4
@@ -26,139 +26,13 @@ dnl is added to the gpg_config_script_wa @@ -26,139 +26,12 @@ dnl is added to the gpg_config_script_warn variable.
dnl dnl
AC_DEFUN([AM_PATH_GPG_ERROR], AC_DEFUN([AM_PATH_GPG_ERROR],
[ AC_REQUIRE([AC_CANONICAL_HOST]) [ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -31,12 +29,10 @@ Index: libgpg-error-1.33/src/gpg-error.m4
- dnl since that is consistent with how our three siblings use the directory/ - dnl since that is consistent with how our three siblings use the directory/
- dnl package name in --with-$dir_name-prefix=PFX. - dnl package name in --with-$dir_name-prefix=PFX.
- AC_ARG_WITH(libgpg-error-prefix, - AC_ARG_WITH(libgpg-error-prefix,
- AC_HELP_STRING([--with-libgpg-error-prefix=PFX], - AS_HELP_STRING([--with-libgpg-error-prefix=PFX],
- [prefix where GPG Error is installed (optional)]), - [prefix where GPG Error is installed (optional)]),
- [gpg_error_config_prefix="$withval"]) - [gpg_error_config_prefix="$withval"])
+ min_gpg_error_version=ifelse([$1], ,0.0,$1) -
+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no])
- dnl Accept --with-gpg-error-prefix and make it work the same as - dnl Accept --with-gpg-error-prefix and make it work the same as
- dnl --with-libgpg-error-prefix above, for backwards compatibility, - dnl --with-libgpg-error-prefix above, for backwards compatibility,
- dnl but do not document this old, inconsistently-named option. - dnl but do not document this old, inconsistently-named option.
@@ -143,6 +139,8 @@ Index: libgpg-error-1.33/src/gpg-error.m4
- fi - fi
- fi - fi
- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) - AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
+ min_gpg_error_version=ifelse([$1], ,0.0,$1)
+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no])
if test $ok = yes; then if test $ok = yes; then
- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags` - GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs` - GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs`
@@ -165,7 +163,7 @@ Index: libgpg-error-1.33/src/gpg-error.m4
fi fi
if test x"$gpg_error_config_host" != xnone ; then if test x"$gpg_error_config_host" != xnone ; then
if test x"$gpg_error_config_host" != x"$host" ; then if test x"$gpg_error_config_host" != x"$host" ; then
@@ -174,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], @@ -174,15 +47,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi fi
fi fi
else else
@@ -181,3 +179,6 @@ Index: libgpg-error-1.33/src/gpg-error.m4
- AC_SUBST(GPG_ERROR_MT_CFLAGS) - AC_SUBST(GPG_ERROR_MT_CFLAGS)
- AC_SUBST(GPG_ERROR_MT_LIBS) - AC_SUBST(GPG_ERROR_MT_LIBS)
]) ])
--
2.25.1
meta/recipes-support/libgpg-error/libgpg-error_1.39.bb → meta/recipes-support/libgpg-error/libgpg-error_1.41.bb
+1 -1
View File
@@ -18,7 +18,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://0001-Do-not-fail-when-testing-config-scripts.patch \ file://0001-Do-not-fail-when-testing-config-scripts.patch \
" "
SRC_URI[sha256sum] = "4a836edcae592094ef1c5a4834908f44986ab2b82e0824a0344b49df8cdb298f" SRC_URI[sha256sum] = "64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742"
BINCONFIG = "${bindir}/gpg-error-config" BINCONFIG = "${bindir}/gpg-error-config"