mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

libgpg-error: 1.49 -> 1.50

Browse Source 
* Rebase pkgconfig.patch
* No license change, just update copyright years:
  2001-2023 -> 2001-2024

(From OE-Core rev: 58576504cf178faf4d18f782f5636e298e4f4175)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
hongxu
2024-08-23 09:47:58 +08:00
committed by Richard Purdie
parent 0a0caacfa5
commit 3983ddabef
2 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
From b0df1cb468264a9bb9113524f0e1318c456b2348 Mon Sep 17 00:00:00 2001
From ba5ec5615d76dfa4afb429a4e11f3e7e3bc9de76 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
Date: Wed, 21 Aug 2024 20:03:29 -0700
Subject: [PATCH 1/2] support pkgconfig
Upstream-Status: Inappropriate [gnupg upstream will not take this, it has been tried with other components]
@@ -13,15 +13,17 @@ Refactored for 1.33
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Rebase to 1.50
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
src/gpg-error.m4 | 192 ++---------------------------------------------
1 file changed, 5 insertions(+), 187 deletions(-)
src/gpg-error.m4 | 200 ++---------------------------------------------
1 file changed, 5 insertions(+), 195 deletions(-)
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
index 7fa52b1..15a0859 100644
index 2d24071..c561725 100644
--- a/src/gpg-error.m4
+++ b/src/gpg-error.m4
@@ -15,187 +15,14 @@
@@ -15,196 +15,14 @@
dnl
dnl Find gpg-error-config, for backward compatibility
dnl
@@ -135,17 +137,16 @@ index 7fa52b1..15a0859 100644
- fi
-
- if test -n "$gpgrt_libdir"; then
- # Add the --libdir option to GPGRT_CONFIG
- 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
- gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
- # Make sure if gpgrt-config really works, by testing config gpg-error
- if ! $GPGRT_CONFIG gpg-error --exists; then
- # If it doesn't work, clear the GPGRT_CONFIG variable.
- unset GPGRT_CONFIG
- fi
- elif test "$GPG_ERROR_CONFIG" != "no"; then
- gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
- else
- # GPGRT_CONFIG found but no suitable dir for --libdir found.
- # This is a failure. Clear the GPGRT_CONFIG variable.
- unset GPGRT_CONFIG
- fi
-])
@@ -155,17 +156,27 @@ index 7fa52b1..15a0859 100644
-dnl
-dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS,
-dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are
-dnl used for programs requireing real multi thread support.
-dnl used for programs requiring real multi thread support.
-dnl
-dnl If a prefix option is not used, the config script is first
-dnl searched in $SYSROOT/bin and then along $PATH. If the used
-dnl config script does not match the host specification the script
-dnl is added to the gpg_config_script_warn variable.
-dnl
-AC_DEFUN([AM_PATH_GPG_ERROR],[dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl
-AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
AC_DEFUN([AM_PATH_GPG_ERROR],
-[ AC_REQUIRE([AC_CANONICAL_HOST])dnl
- AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl
- AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; 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`
- elif test x"$GPG_ERROR_CONFIG" != x -a "$GPG_ERROR_CONFIG" != "no"; then
- gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
- else
- gpg_error_config_version="0.0"
- fi
-
- min_gpg_error_version=ifelse([$1], ,1.33,$1)
- ok=no
- if test "$GPG_ERROR_CONFIG" != "no"; then
@@ -188,7 +199,6 @@ index 7fa52b1..15a0859 100644
- fi
- fi
- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
+AC_DEFUN([AM_PATH_GPG_ERROR],
+[ AC_REQUIRE([AC_CANONICAL_HOST])
+ min_gpg_error_version=ifelse([$1], ,0.0,$1)
+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no])
@@ -214,7 +224,7 @@ index 7fa52b1..15a0859 100644
fi
if test x"$gpg_error_config_host" != xnone ; then
if test x"$gpg_error_config_host" != x"$host" ; then
@@ -211,15 +38,6 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
@@ -220,15 +38,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi
fi
else
@@ -230,3 +240,7 @@ index 7fa52b1..15a0859 100644
- AC_SUBST(GPG_ERROR_MT_CFLAGS)
- AC_SUBST(GPG_ERROR_MT_LIBS)
])
+
--
2.25.1

4
meta/recipes-support/libgpg-error/libgpg-error_1.49.bb → meta/recipes-support/libgpg-error/libgpg-error_1.50.bb
View File

@@ -6,7 +6,7 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://src/gpg-error.h.in;beginline=2;endline=18;md5=20f4cf5d81ea2fad18f6297500018654 \
file://src/gpg-error.h.in;beginline=2;endline=18;md5=badc79a9308e1cbd2657b2441c7cf017 \
file://src/init.c;beginline=2;endline=17;md5=f01cdfcf747af5380590cfd9bbfeaaf7 \
"
@@ -20,7 +20,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://run-ptest \
"
SRC_URI[sha256sum] = "8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9"
SRC_URI[sha256sum] = "69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a"
BINCONFIG = "${bindir}/gpg-error-config"