Signed-off-by: Alexander Kanavin <a...@linutronix.de>
---
.../libgpg-error/libgpg-error/fix-cross.patch | 28 -------------------
.../libgpg-error/libgpg-error/pkgconfig.patch | 17 +++++------
...gpg-error_1.42.bb => libgpg-error_1.43.bb} | 3 +-
3 files changed, 10 insertions(+), 38 deletions(-)
delete mode 100644
meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch
rename meta/recipes-support/libgpg-error/{libgpg-error_1.42.bb =>
libgpg-error_1.43.bb} (92%)
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch
b/meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch
deleted file mode 100644
index ae424cdb9a..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: David Michael <fedora....@gmail.com>
-Date: Fri, 26 Mar 2021 07:06:50 +0000 (+0900)
-Subject: build: Fix generation of lock-obj-pub.native.h for cross build.
-X-Git-Url:
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff_plain;h=33593864cd54143db594c4237bba41e14179061c
-
-build: Fix generation of lock-obj-pub.native.h for cross build.
-
-* src/gen-lock-obj.sh: Capture echo output with quotes.
-
-Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374
-Signed-off-by: David Michael <fedora....@gmail.com>
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
----
-
-diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
-index a710f0c..258eec6 100755
---- a/src/gen-lock-obj.sh
-+++ b/src/gen-lock-obj.sh
-@@ -38,7 +38,7 @@
- # AWK=gawk ./gen-lock-obj.sh
- #
-
--if test -n `echo -n`; then
-+if test -n "`echo -n`"; then
- ECHO_C='\c'
- ECHO_N=''
- else
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
index aea8eba5fa..ff15759309 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
@@ -1,4 +1,4 @@
-From 62651c5c7b4a391f16dbe1b09c6e220efe5c8a35 Mon Sep 17 00:00:00 2001
+From 52aae746760ce5b88e61ce994f5055e4ce809821 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu....@windriver.com>
Date: Thu, 29 Mar 2018 15:12:17 +0800
Subject: [PATCH] support pkgconfig
@@ -14,14 +14,14 @@ Signed-off-by: Armin Kuster <akuster...@gmail.com>
Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com>
---
- src/gpg-error.m4 | 159 +----------------------------------------------
- 1 file changed, 3 insertions(+), 156 deletions(-)
+ src/gpg-error.m4 | 160 +----------------------------------------------
+ 1 file changed, 3 insertions(+), 157 deletions(-)
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
-index d910754..76f045c 100644
+index 56a5d07..28920ae 100644
--- a/src/gpg-error.m4
+++ b/src/gpg-error.m4
-@@ -27,156 +27,12 @@ dnl is added to the gpg_config_script_warn variable.
+@@ -27,157 +27,12 @@ dnl is added to the gpg_config_script_warn variable.
dnl
AC_DEFUN([AM_PATH_GPG_ERROR],
[ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -63,7 +63,7 @@ index d910754..76f045c 100644
- min_gpg_error_version=ifelse([$1], ,1.33,$1)
- ok=no
-
-- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
+- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH])
- if test "$GPGRT_CONFIG" != "no"; then
- # Determine gpgrt_libdir
- #
@@ -78,7 +78,8 @@ index d910754..76f045c 100644
- # Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64
- # It is assumed that CC is specified to the one of host on cross build.
- if libdir_candidates=$(${CC:-cc} -print-search-dirs | \
-- sed -n -e "/^libraries/{s/libraries: =//;s/:/\n/gp}"); then
+- sed -n -e "/^libraries/{s/libraries: =//;s/:/\\
+-/g;p;}"); then
- # From the output of -print-search-dirs, select valid pkgconfig dirs.
- libdir_candidates=$(for dir in $libdir_candidates; do
- if p=$(cd $dir 2>/dev/null && pwd); then
@@ -181,7 +182,7 @@ index d910754..76f045c 100644
fi
if test x"$gpg_error_config_host" != xnone ; then
if test x"$gpg_error_config_host" != x"$host" ; then
-@@ -192,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
+@@ -193,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi
fi
else
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.42.bb
b/meta/recipes-support/libgpg-error/libgpg-error_1.43.bb
similarity index 92%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.42.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.43.bb
index 04f5760b76..fe3824b8e0 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.42.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.43.bb
@@ -17,11 +17,10 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html";
SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://pkgconfig.patch \
file://0001-Do-not-fail-when-testing-config-scripts.patch \
- file://fix-cross.patch \
file://0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch \
"
-SRC_URI[sha256sum] =
"fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23"
+SRC_URI[sha256sum] =
"a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf"
BINCONFIG = "${bindir}/gpg-error-config"
--
2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#158091):
https://lists.openembedded.org/g/openembedded-core/message/158091
Mute This Topic: https://lists.openembedded.org/mt/86965700/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
