diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-02-02 19:27:39 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-05 17:46:05 +0000 |
| commit | f671233fc80cf9fdfeeae44ef86bb64207ef6515 (patch) | |
| tree | 3dbd391f97eb542efc2ae9b638bb2e4e3260412a | |
| parent | 3108c18431a7bcefaabfae0c1464a0cbbbe09814 (diff) | |
| download | poky-f671233fc80cf9fdfeeae44ef86bb64207ef6515.tar.gz | |
libgpg-error: update 1.43 -> 1.44
Drop accepted patch.
(From OE-Core rev: a4dc17a8b4080ca17c0f363163363d5c2af4dc4e)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error/0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error_1.44.bb (renamed from meta/recipes-support/libgpg-error/libgpg-error_1.43.bb) | 3 |
2 files changed, 1 insertions, 29 deletions
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 @@ | |||
| 1 | From 7437acb228678ea5d8288b930b4f5b72c3d449ed Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Mon, 24 May 2021 11:03:42 +0200 | ||
| 4 | Subject: [PATCH] configure.ac: do not hardcode gnu libc when generating | ||
| 5 | lock-obj | ||
| 6 | |||
| 7 | This erroneously excluded e.g. musl libc. | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [by email to gniibe@fsij.org,gnupg-devel@gnupg.org] | ||
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 11 | --- | ||
| 12 | configure.ac | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/configure.ac b/configure.ac | ||
| 16 | index c0aab53..6d46d13 100644 | ||
| 17 | --- a/configure.ac | ||
| 18 | +++ b/configure.ac | ||
| 19 | @@ -603,7 +603,7 @@ if test x"$gl_use_threads" = xno; then | ||
| 20 | AC_MSG_NOTICE([generated src/lock-obj-pub.native.h for $host]) | ||
| 21 | elif test x$cross_compiling = xyes; then | ||
| 22 | case $host in | ||
| 23 | - *-*-linux-gnu*) | ||
| 24 | + *-*-linux-*) | ||
| 25 | AC_CHECK_TOOL(OBJDUMP, [objdump]) | ||
| 26 | if test -n "$OBJDUMP"; then | ||
| 27 | 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 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" | |||
| 17 | SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ | 17 | SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ |
| 18 | file://pkgconfig.patch \ | 18 | file://pkgconfig.patch \ |
| 19 | file://0001-Do-not-fail-when-testing-config-scripts.patch \ | 19 | file://0001-Do-not-fail-when-testing-config-scripts.patch \ |
| 20 | file://0001-configure.ac-do-not-hardcode-gnu-libc-when-generatin.patch \ | ||
| 21 | " | 20 | " |
| 22 | 21 | ||
| 23 | SRC_URI[sha256sum] = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf" | 22 | SRC_URI[sha256sum] = "8e3d2da7a8b9a104dd8e9212ebe8e0daf86aa838cc1314ba6bc4de8f2d8a1ff9" |
| 24 | 23 | ||
| 25 | BINCONFIG = "${bindir}/gpg-error-config" | 24 | BINCONFIG = "${bindir}/gpg-error-config" |
| 26 | 25 | ||
