libgpg-error: update 1.45 -> 1.46

(From OE-Core rev: edb25dbd3cafe553f716b079f6a5af077b73d18a)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-11-20 14:31:20 +01:00
committed by Richard Purdie
parent e7d78bc6d8
commit af0d4a2c43
3 changed files with 15 additions and 11 deletions

View File

@@ -1,4 +1,4 @@
From 137805890951b6b585c1d23097e0a51e8c7a8a50 Mon Sep 17 00:00:00 2001
From a45989a64af20ef6a9f7c1552f19bba116e7cd0a Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 28 Feb 2020 09:19:56 +0000
Subject: [PATCH] Do not fail when testing config scripts
@@ -9,19 +9,19 @@ failure is due to that.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
src/Makefile.am | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 9303954..7630540 100644
index c61adde..1b8b4ff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -344,7 +344,6 @@ gpg-error-config: gpgrt-config gpg-error-config-old
@@ -323,6 +323,5 @@ gpg-error-config: gpgrt-config gpg-error-config-old gpg-error-config-test.sh
else \
echo "no"; \
echo "*** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
- exit 1; \
fi
cp gpg-error-config-old $@

View File

@@ -1,4 +1,4 @@
From 0214d886d0153f7288f81213c47dc50f3b9fde20 Mon Sep 17 00:00:00 2001
From e10f93167c76c477a7b97286cfac603795bf28d8 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Thu, 29 Mar 2018 15:12:17 +0800
Subject: [PATCH] support pkgconfig
@@ -14,14 +14,14 @@ Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
src/gpg-error.m4 | 161 +----------------------------------------------
1 file changed, 3 insertions(+), 158 deletions(-)
src/gpg-error.m4 | 165 +----------------------------------------------
1 file changed, 3 insertions(+), 162 deletions(-)
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
index 4b5cd40..c9978d6 100644
index a975e53..af4bf2f 100644
--- a/src/gpg-error.m4
+++ b/src/gpg-error.m4
@@ -27,158 +27,12 @@ dnl is added to the gpg_config_script_warn variable.
@@ -27,162 +27,12 @@ dnl is added to the gpg_config_script_warn variable.
dnl
AC_DEFUN([AM_PATH_GPG_ERROR],
[ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -118,6 +118,10 @@ index 4b5cd40..c9978d6 100644
- fi
- if test -n "$gpgrt_libdir"; then break; fi
- done
- if test -z "$libdir_candidates"; then
- # No valid pkgconfig dir in any of the system directories, fallback
- gpgrt_libdir=${possible_libdir1}
- fi
- else
- # When we cannot determine system libdir-format, use this:
- gpgrt_libdir=${possible_libdir1}
@@ -183,7 +187,7 @@ index 4b5cd40..c9978d6 100644
fi
if test x"$gpg_error_config_host" != xnone ; then
if test x"$gpg_error_config_host" != x"$host" ; then
@@ -194,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
@@ -198,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi
fi
else

View File

@@ -20,7 +20,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://run-ptest \
"
SRC_URI[sha256sum] = "570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26"
SRC_URI[sha256sum] = "b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d"
BINCONFIG = "${bindir}/gpg-error-config"