From 2099f3b1afe870df89e5fe4a1a6cfd27ef75180d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 27 Apr 2022 10:40:07 +0200 Subject: libgpg-error: 1.44 -> 1.45 (From OE-Core rev: 519fe0b3fbfd7cc5a3b10fa38ef7aac06a76f920) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libgpg-error/libgpg-error/pkgconfig.patch | 13 +++--- .../libgpg-error/libgpg-error_1.44.bb | 53 ---------------------- .../libgpg-error/libgpg-error_1.45.bb | 53 ++++++++++++++++++++++ 3 files changed, 60 insertions(+), 59 deletions(-) delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error_1.44.bb create mode 100644 meta/recipes-support/libgpg-error/libgpg-error_1.45.bb diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 6b9b623b54..82bb4cdb47 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 52aae746760ce5b88e61ce994f5055e4ce809821 Mon Sep 17 00:00:00 2001 +From 0214d886d0153f7288f81213c47dc50f3b9fde20 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 29 Mar 2018 15:12:17 +0800 Subject: [PATCH] support pkgconfig @@ -14,14 +14,14 @@ Signed-off-by: Armin Kuster Signed-off-by: Zheng Ruoqin --- - src/gpg-error.m4 | 160 +---------------------------------------------- - 1 file changed, 3 insertions(+), 157 deletions(-) + src/gpg-error.m4 | 161 +---------------------------------------------- + 1 file changed, 3 insertions(+), 158 deletions(-) diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 -index 56a5d07..28920ae 100644 +index 4b5cd40..c9978d6 100644 --- a/src/gpg-error.m4 +++ b/src/gpg-error.m4 -@@ -27,157 +27,12 @@ dnl is added to the gpg_config_script_warn variable. +@@ -27,158 +27,12 @@ dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_GPG_ERROR], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -137,6 +137,7 @@ index 56a5d07..28920ae 100644 - fi - elif test "$GPG_ERROR_CONFIG" != "no"; then - gpg_error_config_version=`$GPG_ERROR_CONFIG --version` +- unset GPGRT_CONFIG - fi - if test "$GPG_ERROR_CONFIG" != "no"; then - req_major=`echo $min_gpg_error_version | \ @@ -182,7 +183,7 @@ index 56a5d07..28920ae 100644 fi if test x"$gpg_error_config_host" != xnone ; then if test x"$gpg_error_config_host" != x"$host" ; then -@@ -193,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], +@@ -194,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], fi fi else diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.44.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.44.bb deleted file mode 100644 index f5b482f4c9..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.44.bb +++ /dev/null @@ -1,53 +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=d82591bc81561f617da71e00ff4a9d79 \ - 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] = "8e3d2da7a8b9a104dd8e9212ebe8e0daf86aa838cc1314ba6bc4de8f2d8a1ff9" - -BINCONFIG = "${bindir}/gpg-error-config" - -inherit autotools binconfig-disabled pkgconfig gettext multilib_header multilib_script ptest - -RDEPENDS:${PN}-ptest:append = " make" - -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.45.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.45.bb new file mode 100644 index 0000000000..ff3a673df2 --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.45.bb @@ -0,0 +1,53 @@ +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=d82591bc81561f617da71e00ff4a9d79 \ + 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] = "570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26" + +BINCONFIG = "${bindir}/gpg-error-config" + +inherit autotools binconfig-disabled pkgconfig gettext multilib_header multilib_script ptest + +RDEPENDS:${PN}-ptest:append = " make" + +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