mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
libgpg-error: update 1.41 -> 1.42
(From OE-Core rev: 9d08ba366260a161c34b81ad6d9e52fe970e83d3) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
2267eebd65
commit
8c18e3c062
+27
@@ -0,0 +1,27 @@
|
||||
From 7437acb228678ea5d8288b930b4f5b72c3d449ed Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Mon, 24 May 2021 11:03:42 +0200
|
||||
Subject: [PATCH] configure.ac: do not hardcode gnu libc when generating
|
||||
lock-obj
|
||||
|
||||
This erroneously excluded e.g. musl libc.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c0aab53..6d46d13 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -603,7 +603,7 @@ if test x"$gl_use_threads" = xno; then
|
||||
AC_MSG_NOTICE([generated src/lock-obj-pub.native.h for $host])
|
||||
elif test x$cross_compiling = xyes; then
|
||||
case $host in
|
||||
- *-*-linux-gnu*)
|
||||
+ *-*-linux-*)
|
||||
AC_CHECK_TOOL(OBJDUMP, [objdump])
|
||||
if test -n "$OBJDUMP"; then
|
||||
lock_obj_h_generated=yes
|
||||
@@ -0,0 +1,28 @@
|
||||
From: David Michael <fedora.dm0@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.dm0@gmail.com>
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@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
|
||||
@@ -1,4 +1,4 @@
|
||||
From ec309e20b5a27d42a5fb915c328d61e924ab5f19 Mon Sep 17 00:00:00 2001
|
||||
From 62651c5c7b4a391f16dbe1b09c6e220efe5c8a35 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
|
||||
@@ -12,15 +12,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Refactored for 1.33
|
||||
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
||||
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
|
||||
|
||||
---
|
||||
src/gpg-error.m4 | 142 +----------------------------------------------
|
||||
1 file changed, 3 insertions(+), 139 deletions(-)
|
||||
src/gpg-error.m4 | 159 +----------------------------------------------
|
||||
1 file changed, 3 insertions(+), 156 deletions(-)
|
||||
|
||||
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
|
||||
index c9b235f..176bd6a 100644
|
||||
index d910754..76f045c 100644
|
||||
--- a/src/gpg-error.m4
|
||||
+++ b/src/gpg-error.m4
|
||||
@@ -26,139 +26,12 @@ dnl is added to the gpg_config_script_warn variable.
|
||||
@@ -27,156 +27,12 @@ dnl is added to the gpg_config_script_warn variable.
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_GPG_ERROR],
|
||||
[ AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
@@ -62,45 +63,78 @@ index c9b235f..176bd6a 100644
|
||||
- min_gpg_error_version=ifelse([$1], ,1.33,$1)
|
||||
- ok=no
|
||||
-
|
||||
- if test "$prefix" = NONE ; then
|
||||
- prefix_option_expanded=/usr/local
|
||||
- else
|
||||
- prefix_option_expanded="$prefix"
|
||||
- fi
|
||||
- if test "$exec_prefix" = NONE ; then
|
||||
- exec_prefix_option_expanded=$prefix_option_expanded
|
||||
- else
|
||||
- exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix)
|
||||
- fi
|
||||
- libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir)
|
||||
-
|
||||
- if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then
|
||||
- gpgrt_libdir=$libdir_option_expanded
|
||||
- else
|
||||
- if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then
|
||||
- if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then
|
||||
- if test -f $possible_libdir/pkgconfig/gpg-error.pc; then
|
||||
- gpgrt_libdir=$possible_libdir
|
||||
- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
|
||||
- if test "$GPGRT_CONFIG" != "no"; then
|
||||
- # Determine gpgrt_libdir
|
||||
- #
|
||||
- # Get the prefix of gpgrt-config assuming it's something like:
|
||||
- # <PREFIX>/bin/gpgrt-config
|
||||
- gpgrt_prefix=${GPGRT_CONFIG%/*/*}
|
||||
- possible_libdir1=${gpgrt_prefix}/lib
|
||||
- # Determine by using system libdir-format with CC, it's like:
|
||||
- # Normal style: /usr/lib
|
||||
- # GNU cross style: /usr/<triplet>/lib
|
||||
- # Debian style: /usr/lib/<multiarch-name>
|
||||
- # 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
|
||||
- # 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
|
||||
- test -d "$p/pkgconfig" && echo $p;
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- done)
|
||||
-
|
||||
- if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then
|
||||
- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
|
||||
- if test "$GPGRT_CONFIG" = "no"; then
|
||||
- unset GPGRT_CONFIG
|
||||
- for possible_libdir0 in $libdir_candidates; do
|
||||
- # possible_libdir0:
|
||||
- # Fallback candidate, the one of system-installed (by $CC)
|
||||
- # (/usr/<triplet>/lib, /usr/lib/<multiarch-name> or /usr/lib32)
|
||||
- # possible_libdir1:
|
||||
- # Another candidate, user-locally-installed
|
||||
- # (<gpgrt_prefix>/lib)
|
||||
- # possible_libdir2
|
||||
- # Most preferred
|
||||
- # (<gpgrt_prefix>/<triplet>/lib,
|
||||
- # <gpgrt_prefix>/lib/<multiarch-name> or <gpgrt_prefix>/lib32)
|
||||
- if test "${possible_libdir0##*/}" = "lib"; then
|
||||
- possible_prefix0=${possible_libdir0%/lib}
|
||||
- possible_prefix0_triplet=${possible_prefix0##*/}
|
||||
- if test -z "$possible_prefix0_triplet"; then
|
||||
- continue
|
||||
- fi
|
||||
- possible_libdir2=${gpgrt_prefix}/$possible_prefix0_triplet/lib
|
||||
- else
|
||||
- possible_prefix0=${possible_libdir0%%/lib*}
|
||||
- possible_libdir2=${gpgrt_prefix}${possible_libdir0#$possible_prefix0}
|
||||
- fi
|
||||
- if test -f ${possible_libdir2}/pkgconfig/gpg-error.pc; then
|
||||
- gpgrt_libdir=${possible_libdir2}
|
||||
- elif test -f ${possible_libdir1}/pkgconfig/gpg-error.pc; then
|
||||
- gpgrt_libdir=${possible_libdir1}
|
||||
- elif test -f ${possible_libdir0}/pkgconfig/gpg-error.pc; then
|
||||
- gpgrt_libdir=${possible_libdir0}
|
||||
- fi
|
||||
- if test -n "$gpgrt_libdir"; then break; fi
|
||||
- done
|
||||
- else
|
||||
- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
|
||||
- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
|
||||
- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
|
||||
- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
|
||||
- gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
|
||||
- else
|
||||
- unset GPGRT_CONFIG
|
||||
- fi
|
||||
- # When we cannot determine system libdir-format, use this:
|
||||
- gpgrt_libdir=${possible_libdir1}
|
||||
- fi
|
||||
- else
|
||||
- unset GPGRT_CONFIG
|
||||
- fi
|
||||
-
|
||||
- if test -n "$gpgrt_libdir"; then
|
||||
- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
|
||||
- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
|
||||
- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
|
||||
- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
|
||||
- gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
|
||||
- else
|
||||
- unset GPGRT_CONFIG
|
||||
- fi
|
||||
- elif test "$GPG_ERROR_CONFIG" != "no"; then
|
||||
- gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
|
||||
- fi
|
||||
- if test "$GPG_ERROR_CONFIG" != "no"; then
|
||||
@@ -121,22 +155,6 @@ index c9b235f..176bd6a 100644
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then
|
||||
- if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then
|
||||
- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
|
||||
- if test "$GPGRT_CONFIG" = "no"; then
|
||||
- unset GPGRT_CONFIG
|
||||
- else
|
||||
- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
|
||||
- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
|
||||
- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
|
||||
- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
|
||||
- else
|
||||
- unset GPGRT_CONFIG
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
|
||||
+ min_gpg_error_version=ifelse([$1], ,0.0,$1)
|
||||
@@ -163,7 +181,7 @@ index c9b235f..176bd6a 100644
|
||||
fi
|
||||
if test x"$gpg_error_config_host" != xnone ; then
|
||||
if test x"$gpg_error_config_host" != x"$host" ; then
|
||||
@@ -174,15 +47,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
|
||||
@@ -192,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
|
||||
fi
|
||||
fi
|
||||
else
|
||||
@@ -179,6 +197,3 @@ index c9b235f..176bd6a 100644
|
||||
- AC_SUBST(GPG_ERROR_MT_CFLAGS)
|
||||
- AC_SUBST(GPG_ERROR_MT_LIBS)
|
||||
])
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
||||
+3
-1
@@ -17,9 +17,11 @@ 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] = "64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742"
|
||||
SRC_URI[sha256sum] = "fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23"
|
||||
|
||||
BINCONFIG = "${bindir}/gpg-error-config"
|
||||
|
||||
Reference in New Issue
Block a user