summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch31
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.41.bb (renamed from meta/recipes-support/libgpg-error/libgpg-error_1.39.bb)2
2 files changed, 17 insertions, 16 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
index ca5f6b5c25..83054a9c44 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
@@ -11,18 +11,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11 11
12Refactored for 1.33 12Refactored for 1.33
13Signed-off-by: Armin Kuster <akuster808@gmail.com> 13Signed-off-by: Armin Kuster <akuster808@gmail.com>
14 14Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
15--- 15---
16 configure.ac | 1 + 16 src/gpg-error.m4 | 142 +----------------------------------------------
17 src/gpg-error.m4 | 71 +++-------------------------------------------------- 17 1 file changed, 3 insertions(+), 139 deletions(-)
18 4 files changed, 18 insertions(+), 69 deletions(-)
19 create mode 100644 src/gpg-error.pc.in
20 18
21Index: libgpg-error-1.33/src/gpg-error.m4 19diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
22=================================================================== 20index c9b235f..176bd6a 100644
23--- libgpg-error-1.33.orig/src/gpg-error.m4 21--- a/src/gpg-error.m4
24+++ libgpg-error-1.33/src/gpg-error.m4 22+++ b/src/gpg-error.m4
25@@ -26,139 +26,13 @@ dnl is added to the gpg_config_script_wa 23@@ -26,139 +26,12 @@ dnl is added to the gpg_config_script_warn variable.
26 dnl 24 dnl
27 AC_DEFUN([AM_PATH_GPG_ERROR], 25 AC_DEFUN([AM_PATH_GPG_ERROR],
28 [ AC_REQUIRE([AC_CANONICAL_HOST]) 26 [ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -31,12 +29,10 @@ Index: libgpg-error-1.33/src/gpg-error.m4
31- dnl since that is consistent with how our three siblings use the directory/ 29- dnl since that is consistent with how our three siblings use the directory/
32- dnl package name in --with-$dir_name-prefix=PFX. 30- dnl package name in --with-$dir_name-prefix=PFX.
33- AC_ARG_WITH(libgpg-error-prefix, 31- AC_ARG_WITH(libgpg-error-prefix,
34- AC_HELP_STRING([--with-libgpg-error-prefix=PFX], 32- AS_HELP_STRING([--with-libgpg-error-prefix=PFX],
35- [prefix where GPG Error is installed (optional)]), 33- [prefix where GPG Error is installed (optional)]),
36- [gpg_error_config_prefix="$withval"]) 34- [gpg_error_config_prefix="$withval"])
37+ min_gpg_error_version=ifelse([$1], ,0.0,$1) 35-
38+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no])
39
40- dnl Accept --with-gpg-error-prefix and make it work the same as 36- dnl Accept --with-gpg-error-prefix and make it work the same as
41- dnl --with-libgpg-error-prefix above, for backwards compatibility, 37- dnl --with-libgpg-error-prefix above, for backwards compatibility,
42- dnl but do not document this old, inconsistently-named option. 38- dnl but do not document this old, inconsistently-named option.
@@ -143,6 +139,8 @@ Index: libgpg-error-1.33/src/gpg-error.m4
143- fi 139- fi
144- fi 140- fi
145- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) 141- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
142+ min_gpg_error_version=ifelse([$1], ,0.0,$1)
143+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no])
146 if test $ok = yes; then 144 if test $ok = yes; then
147- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags` 145- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
148- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs` 146- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs`
@@ -165,7 +163,7 @@ Index: libgpg-error-1.33/src/gpg-error.m4
165 fi 163 fi
166 if test x"$gpg_error_config_host" != xnone ; then 164 if test x"$gpg_error_config_host" != xnone ; then
167 if test x"$gpg_error_config_host" != x"$host" ; then 165 if test x"$gpg_error_config_host" != x"$host" ; then
168@@ -174,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], 166@@ -174,15 +47,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
169 fi 167 fi
170 fi 168 fi
171 else 169 else
@@ -181,3 +179,6 @@ Index: libgpg-error-1.33/src/gpg-error.m4
181- AC_SUBST(GPG_ERROR_MT_CFLAGS) 179- AC_SUBST(GPG_ERROR_MT_CFLAGS)
182- AC_SUBST(GPG_ERROR_MT_LIBS) 180- AC_SUBST(GPG_ERROR_MT_LIBS)
183 ]) 181 ])
182--
1832.25.1
184
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.39.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.41.bb
index f53056f5c9..8205cb4557 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.39.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.41.bb
@@ -18,7 +18,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
18 file://0001-Do-not-fail-when-testing-config-scripts.patch \ 18 file://0001-Do-not-fail-when-testing-config-scripts.patch \
19 " 19 "
20 20
21SRC_URI[sha256sum] = "4a836edcae592094ef1c5a4834908f44986ab2b82e0824a0344b49df8cdb298f" 21SRC_URI[sha256sum] = "64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742"
22 22
23BINCONFIG = "${bindir}/gpg-error-config" 23BINCONFIG = "${bindir}/gpg-error-config"
24 24