From a4dc17a8b4080ca17c0f363163363d5c2af4dc4e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 2 Feb 2022 19:27:39 +0100 Subject: [PATCH] libgpg-error: update 1.43 -> 1.44 Drop accepted patch. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...not-hardcode-gnu-libc-when-generatin.patch | 27 ------------------- ...gpg-error_1.43.bb => libgpg-error_1.44.bb} | 3 +-- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch rename meta/recipes-support/libgpg-error/{libgpg-error_1.43.bb => libgpg-error_1.44.bb} (89%) diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch deleted file mode 100644 index ef7a7df1b8..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7437acb228678ea5d8288b930b4f5b72c3d449ed Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -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: Submitted [by email to gniibe@fsij.org,gnupg-devel@gnupg.org] -Signed-off-by: Alexander Kanavin ---- - 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 diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.43.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.44.bb similarity index 89% rename from meta/recipes-support/libgpg-error/libgpg-error_1.43.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.44.bb index fe3824b8e0..e3171f0f25 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.43.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.44.bb @@ -17,10 +17,9 @@ 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://0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch \ " -SRC_URI[sha256sum] = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf" +SRC_URI[sha256sum] = "8e3d2da7a8b9a104dd8e9212ebe8e0daf86aa838cc1314ba6bc4de8f2d8a1ff9" BINCONFIG = "${bindir}/gpg-error-config" -- 2.40.1