mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

libgpg-error: update 1.42 -> 1.43

Browse Source 
(From OE-Core rev: 7637c0ccd5bc41eda7cd40e4f56dfbe5fbd17e0a)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2021-11-10 20:39:20 +01:00
committed by Richard Purdie
parent 259afff652
commit af7a8e775b
3 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
meta/recipes-support/libgpg-error/libgpg-error/fix-cross.patch
View File

@@ -1,28 +0,0 @@
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

17
meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
View File

@@ -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.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Thu, 29 Mar 2018 15:12:17 +0800 Date: Thu, 29 Mar 2018 15:12:17 +0800
Subject: [PATCH] support pkgconfig 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> Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
--- ---
src/gpg-error.m4 | 159 +---------------------------------------------- src/gpg-error.m4 | 160 +----------------------------------------------
1 file changed, 3 insertions(+), 156 deletions(-) 1 file changed, 3 insertions(+), 157 deletions(-)
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 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 --- a/src/gpg-error.m4
+++ b/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 dnl
AC_DEFUN([AM_PATH_GPG_ERROR], AC_DEFUN([AM_PATH_GPG_ERROR],
[ AC_REQUIRE([AC_CANONICAL_HOST]) [ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -63,7 +63,7 @@ index d910754..76f045c 100644
- min_gpg_error_version=ifelse([$1], ,1.33,$1) - min_gpg_error_version=ifelse([$1], ,1.33,$1)
- ok=no - 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 - if test "$GPGRT_CONFIG" != "no"; then
- # Determine gpgrt_libdir - # Determine gpgrt_libdir
- # - #
@@ -78,7 +78,8 @@ index d910754..76f045c 100644
- # Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64 - # 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. - # It is assumed that CC is specified to the one of host on cross build.
- if libdir_candidates=$(${CC:-cc} -print-search-dirs | \ - 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. - # From the output of -print-search-dirs, select valid pkgconfig dirs.
- libdir_candidates=$(for dir in $libdir_candidates; do - libdir_candidates=$(for dir in $libdir_candidates; do
- if p=$(cd $dir 2>/dev/null && pwd); then - if p=$(cd $dir 2>/dev/null && pwd); then
@@ -181,7 +182,7 @@ index d910754..76f045c 100644
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
@@ -192,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], @@ -193,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi fi
fi fi
else else

3
meta/recipes-support/libgpg-error/libgpg-error_1.42.bb → meta/recipes-support/libgpg-error/libgpg-error_1.43.bb
View File

@@ -17,11 +17,10 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://pkgconfig.patch \ file://pkgconfig.patch \
file://0001-Do-not-fail-when-testing-config-scripts.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 \ 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" BINCONFIG = "${bindir}/gpg-error-config"