From 51f694db182cc21d020462f51e80e1cbb96b73b6 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 14 Oct 2025 14:58:41 +0800 Subject: libgpg-error: 1.55 -> 1.56 - Refresh pkgconfig.patch (From OE-Core rev: 207112631575d5f85e57bc35dacc25fff768d280) Signed-off-by: Hongxu Jia Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../libgpg-error/libgpg-error/pkgconfig.patch | 11 +++-- .../libgpg-error/libgpg-error_1.55.bb | 54 ---------------------- .../libgpg-error/libgpg-error_1.56.bb | 54 ++++++++++++++++++++++ 3 files changed, 61 insertions(+), 58 deletions(-) delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error_1.55.bb create mode 100644 meta/recipes-support/libgpg-error/libgpg-error_1.56.bb diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index dbf728b2de..38c55ad342 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 3529df77cd20253ce2a9c1962d7a72058a04fd98 Mon Sep 17 00:00:00 2001 +From fdc0b6f84bae7cd6eea18712049da62cdfd5e630 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 21 Aug 2024 20:03:29 -0700 Subject: [PATCH] support pkgconfig @@ -20,7 +20,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 5 insertions(+), 195 deletions(-) diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 -index 2d24071..c561725 100644 +index 263f21b..e54ab38 100644 --- a/src/gpg-error.m4 +++ b/src/gpg-error.m4 @@ -15,196 +15,14 @@ @@ -167,11 +167,11 @@ index 2d24071..c561725 100644 -[ 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 +- if test x"$GPGRT_CONFIG" != x && test "$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 +- elif test x"$GPG_ERROR_CONFIG" != x && test "$GPG_ERROR_CONFIG" != "no"; then - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` - else - gpg_error_config_version="0.0" @@ -241,3 +241,6 @@ index 2d24071..c561725 100644 - AC_SUBST(GPG_ERROR_MT_LIBS) ]) + +-- +2.34.1 + diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.55.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.55.bb deleted file mode 100644 index 7de52314a4..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.55.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Small library that defines common error values for all GnuPG components" -DESCRIPTION = "Contains common error codes and error handling functions used by GnuPG, Libgcrypt, GPGME and more packages. " -HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/" -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=badc79a9308e1cbd2657b2441c7cf017 \ - file://src/init.c;beginline=2;endline=17;md5=f01cdfcf747af5380590cfd9bbfeaaf7 \ - " - -SECTION = "libs" - -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://run-ptest \ - " - -SRC_URI[sha256sum] = "95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78" - -BINCONFIG = "${bindir}/gpg-error-config" - -inherit autotools binconfig-disabled pkgconfig gettext multilib_header multilib_script ptest - -require recipes-support/gnupg/drop-unknown-suffix.inc - -RDEPENDS:${PN}-ptest:append = " make bash" - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/gpgrt-config" - -CPPFLAGS += "-P" - -do_install:append() { - # we don't have common lisp in OE - rm -rf "${D}${datadir}/common-lisp/" - oe_multilib_header gpg-error.h gpgrt.h -} - -do_compile_ptest() { - oe_runmake -C tests buildtest-TESTS -} - -do_install_ptest() { - install ${B}/tests/t-*[!\.o] ${D}${PTEST_PATH} - install ${B}/tests/Makefile ${D}${PTEST_PATH} -} - -FILES:${PN}-dev += "${bindir}/gpg-error" -FILES:${PN}-doc += "${datadir}/libgpg-error/errorref.txt" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.56.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.56.bb new file mode 100644 index 0000000000..d3cc88f971 --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.56.bb @@ -0,0 +1,54 @@ +SUMMARY = "Small library that defines common error values for all GnuPG components" +DESCRIPTION = "Contains common error codes and error handling functions used by GnuPG, Libgcrypt, GPGME and more packages. " +HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/" +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=badc79a9308e1cbd2657b2441c7cf017 \ + file://src/init.c;beginline=2;endline=17;md5=f01cdfcf747af5380590cfd9bbfeaaf7 \ + " + +SECTION = "libs" + +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://run-ptest \ + " + +SRC_URI[sha256sum] = "82c3d2deb4ad96ad3925d6f9f124fe7205716055ab50e291116ef27975d169c0" + +BINCONFIG = "${bindir}/gpg-error-config" + +inherit autotools binconfig-disabled pkgconfig gettext multilib_header multilib_script ptest + +require recipes-support/gnupg/drop-unknown-suffix.inc + +RDEPENDS:${PN}-ptest:append = " make bash" + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/gpgrt-config" + +CPPFLAGS += "-P" + +do_install:append() { + # we don't have common lisp in OE + rm -rf "${D}${datadir}/common-lisp/" + oe_multilib_header gpg-error.h gpgrt.h +} + +do_compile_ptest() { + oe_runmake -C tests buildtest-TESTS +} + +do_install_ptest() { + install ${B}/tests/t-*[!\.o] ${D}${PTEST_PATH} + install ${B}/tests/Makefile ${D}${PTEST_PATH} +} + +FILES:${PN}-dev += "${bindir}/gpg-error" +FILES:${PN}-doc += "${datadir}/libgpg-error/errorref.txt" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf