From: Fabrice Fontaine Date: Mon, 21 Jun 2021 05:47:43 +0000 (+0200) Subject: package/libgpg-error: bump to version 1.42 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b1524beef11cddd66a39a195dab565cb4a7b317;p=buildroot.git package/libgpg-error: bump to version 1.42 Drop patch (not needed since https://dev.gnupg.org/rE1fb90a7da186ee2ee098a666f6f3a35bb1720e59) https://dev.gnupg.org/T5194 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- diff --git a/package/libgpg-error/0001-build-Fix-disable-threads.patch b/package/libgpg-error/0001-build-Fix-disable-threads.patch new file mode 100644 index 0000000000..2d101aad9b --- /dev/null +++ b/package/libgpg-error/0001-build-Fix-disable-threads.patch @@ -0,0 +1,39 @@ +From 220a427b4f997ef6af1b2d4e82ef1dc96e0cd6ff Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Mon, 21 Jun 2021 12:16:20 +0900 +Subject: [PATCH] build: Fix --disable-threads. + +* src/gen-lock-obj.sh: Fix generating '}}}'. + +-- + +GnuPG-bug-id: 5495 +Reported-by: Fabrice Fontaine +Fixes-commit: 1fb90a7da186ee2ee098a666f6f3a35bb1720e59 +Signed-off-by: NIIBE Yutaka +[Retrieved from: +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=220a427b4f997ef6af1b2d4e82ef1dc96e0cd6ff] +Signed-off-by: Fabrice Fontaine +--- + src/gen-lock-obj.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh +index 258eec6..014667f 100755 +--- a/src/gen-lock-obj.sh ++++ b/src/gen-lock-obj.sh +@@ -121,10 +121,10 @@ while test "$i" -lt $ac_mtx_size; do + fi + i=$(( i + 1 )) + done ++echo '}}}' + fi + + cat <<'EOF' +-}}} + ## + ## Local Variables: + ## mode: c +-- +2.11.0 + diff --git a/package/libgpg-error/0001-configure.ac-fix-build-without-threads.patch b/package/libgpg-error/0001-configure.ac-fix-build-without-threads.patch deleted file mode 100644 index 5f5147e0df..0000000000 --- a/package/libgpg-error/0001-configure.ac-fix-build-without-threads.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 77c89f62f106d88ef2b5963f4a13755c337c793d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 15 Feb 2021 07:56:29 +0100 -Subject: [PATCH] configure.ac: fix build without threads - -Cross-compilation of libgpg-error fails on toolchain without threads -since commit 988211d3d4c1f3d5cfa6b460210f65ab636763b5, -9ee011259f819a3cf50fe7019fa4366dbc437e0e and -50e62b36ea01ed25d12c443088b85d4f41a2b3e1 - -Indeed, since that time, libgpg-error assumes that pthread.h is always -available resulting in the following error at configure time: - -checking for arm-unknown-linux-gnueabi-objdump... (cached) /tmp/instance-1/output-1/host/bin/arm-linux-objdump -conftest.c:1:10: fatal error: pthread.h: No such file or directory - 1 | #include - | ^~~~~~~~~~~ -compilation terminated. -configure: generated src/lock-obj-pub.native.h using arm-unknown-linux-gnueabi-objdump and gawk -checking whether to enable log_clock... no - -This error will in turn results in a build failure because -"Can't determine mutex size" is echoed by gen-lock-obj.sh: - -In file included from strsource-sym.c:27: -./gpg-error.h:1115:4: warning: missing terminating ' character - 1115 | Can't determine mutex size - | ^ - -Full build log: -http://autobuild.buildroot.org/results/334/3344c96e5627a9327b0eabe0b27f34490bbabc0d/build-end.log - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://dev.gnupg.org/T5296] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index b9a2a3e..15d9fdc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -599,7 +599,7 @@ if test x$cross_compiling = xyes; then - case $host in - *-*-linux*) - AC_CHECK_TOOL(OBJDUMP, [objdump]) -- if test -n "$OBJDUMP"; then -+ if test -n "$OBJDUMP" -a x"$gl_use_threads" != xno; then - lock_obj_h_generated=yes - if test ! -d src; then mkdir src; fi - LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \ --- -2.30.0 - diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index 315c0965cf..4e124941cd 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,10 +1,10 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 66d6270511a48bac0bf347330e7a12c62f3a1ab4 libgpg-error-1.41.tar.bz2 +sha1 5e620d71fc24d287a7ac2460b1d819074bb8b9bb libgpg-error-1.42.tar.bz2 # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.41.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742 libgpg-error-1.41.tar.bz2 +sha256 fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23 libgpg-error-1.42.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 1b35e5c8f0..babcbdaded 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.41 +LIBGPG_ERROR_VERSION = 1.42 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ @@ -15,8 +15,6 @@ LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LIBGPG_ERROR_CONF_OPTS = --disable-tests \ --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) -# We're patching configure.ac -LIBGPG_ERROR_AUTORECONF= YES ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBGPG_ERROR_CONF_OPTS += --enable-threads