- libgpg-error: bump version to 1.41

make/target-libs.mk

@@ -319,45 +319,6 @@ libbluray: $(LIBBLURAY_DEPENDENCIES) $(DL_DIR)/$(LIBBLURAY_SOURCE) | $(TARGET_DI
 
 # -----------------------------------------------------------------------------
 
-LIBGPG_ERROR_VERSION = 1.37
-LIBGPG_ERROR_DIR = libgpg-error-$(LIBGPG_ERROR_VERSION)
-LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2
-LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
-
-$(DL_DIR)/$(LIBGPG_ERROR_SOURCE):
-	$(download) $(LIBGPG_ERROR_SITE)/$(LIBGPG_ERROR_SOURCE)
-
-LIBGPG_ERROR_AUTORECONF = YES
-
-LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config
-
-LIBGPG_ERROR_CONF_OPTS = \
-	--datarootdir=$(REMOVE_datarootdir) \
-	--enable-shared \
-	--disable-doc \
-	--disable-languages \
-	--disable-static \
-	--disable-tests
-
-libgpg-error: $(DL_DIR)/$(LIBGPG_ERROR_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(PKG_DIR)
-	$(UNTAR)/$(PKG_SOURCE)
-	$(CHDIR)/$(PKG_DIR); \
-		pushd src/syscfg; \
-			ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h lock-obj-pub.$(TARGET).h; \
-			ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h lock-obj-pub.linux-uclibcgnueabi.h; \
-		popd; \
-		$(CONFIGURE); \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(TARGET_RM) $(addprefix $(TARGET_bindir)/,gpg-error gpgrt-config)
-	$(REWRITE_CONFIG_SCRIPTS)
-	$(REWRITE_LIBTOOL)
-	$(REMOVE)/$(PKG_DIR)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
-
 LIBAACS_VERSION = 0.9.0
 LIBAACS_DIR = libaacs-$(LIBAACS_VERSION)
 LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2

package/libgpg-error/libgpg-error.mk

@@ -0,0 +1,36 @@
+################################################################################
+#
+# libgpg-error
+#
+################################################################################
+
+LIBGPG_ERROR_VERSION = 1.41
+LIBGPG_ERROR_DIR = libgpg-error-$(LIBGPG_ERROR_VERSION)
+LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2
+LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
+
+LIBGPG_ERROR_AUTORECONF = YES
+
+LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config
+
+LIBGPG_ERROR_CONF_OPTS = \
+	--datarootdir=$(REMOVE_datarootdir) \
+	--enable-shared \
+	--disable-doc \
+	--disable-languages \
+	--disable-static \
+	--disable-tests
+
+define LIBGPG_ERROR_LINKING_HEADER
+	ln -sf lock-obj-pub.arm-unknown-linux-gnueabi.h $(PKG_BUILD_DIR)/src/syscfg/lock-obj-pub.$(TARGET).h
+	ln -sf lock-obj-pub.arm-unknown-linux-gnueabi.h $(PKG_BUILD_DIR)/src/syscfg/lock-obj-pub.linux-uclibcgnueabi.h
+endef
+LIBGPG_ERROR_POST_EXTRACT_HOOKS += LIBGPG_ERROR_LINKING_HEADER
+
+define LIBGPG_ERROR_TARGET_CLEANUP
+	$(TARGET_RM) $(addprefix $(TARGET_bindir)/,gpg-error gpgrt-config)
+endef
+LIBGPG_ERROR_TARGET_FINALIZE_HOOKS += LIBGPG_ERROR_TARGET_CLEANUP
+
+libgpg-error: | $(TARGET_DIR)
+	$(call autotools-package)

package/libgpg-error/patches/0001-configure.ac-fix-build-without-threads.patch

@@ -0,0 +1,54 @@
+From 77c89f62f106d88ef2b5963f4a13755c337c793d Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+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 <pthread.h>
+      |          ^~~~~~~~~~~
+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 <fontaine.fabrice@gmail.com>
+[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
+