From bee48ba46dd31ee8f60e9a2b1691373767eab11e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 22 Sep 2023 10:57:02 +0200 Subject: libgpg-error: update to 1.47 --- package/libgpg-error/Makefile | 10 +++++++-- .../libgpg-error/patches/patch-src_gen-lock-obj_sh | 11 ---------- .../syscfg/lock-obj-pub.xtensa-unknown-linux-gnu.h | 24 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 13 deletions(-) delete mode 100644 package/libgpg-error/patches/patch-src_gen-lock-obj_sh create mode 100644 package/libgpg-error/src/src/syscfg/lock-obj-pub.xtensa-unknown-linux-gnu.h diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index 5be1496ec..f0a968f67 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libgpg-error -PKG_VERSION:= 1.42 +PKG_VERSION:= 1.47 PKG_RELEASE:= 1 -PKG_HASH:= fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23 +PKG_HASH:= 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb PKG_DESCR:= helper library for common error codes and descriptions PKG_SECTION:= libs/misc PKG_URL:= http://www.gnupg.org/ @@ -59,6 +59,12 @@ endif ifeq ($(ADK_TARGET_ARCH_X86_64),y) LIBGPG_PREFIX:= x86_64-pc-linux-gnu endif +ifeq ($(ADK_TARGET_ARCH_XTENSA),y) +LIBGPG_PREFIX:= xtensa-unknown-linux-gnu +endif + +CONFIGURE_ARGS+= --disable-tests \ + --disable-languages post-extract: cd $(WRKSRC)/src/syscfg && ( \ diff --git a/package/libgpg-error/patches/patch-src_gen-lock-obj_sh b/package/libgpg-error/patches/patch-src_gen-lock-obj_sh deleted file mode 100644 index 04961a5ff..000000000 --- a/package/libgpg-error/patches/patch-src_gen-lock-obj_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- libgpg-error-1.42.orig/src/gen-lock-obj.sh 2021-03-04 11:05:29.000000000 +0100 -+++ libgpg-error-1.42/src/gen-lock-obj.sh 2021-09-17 16:43:42.304505465 +0200 -@@ -38,7 +38,7 @@ - # AWK=gawk ./gen-lock-obj.sh - # - --if test -n `echo -n`; then -+if test -n "`echo -n`"; then - ECHO_C='\c' - ECHO_N='' - else diff --git a/package/libgpg-error/src/src/syscfg/lock-obj-pub.xtensa-unknown-linux-gnu.h b/package/libgpg-error/src/src/syscfg/lock-obj-pub.xtensa-unknown-linux-gnu.h new file mode 100644 index 000000000..60eadab8e --- /dev/null +++ b/package/libgpg-error/src/src/syscfg/lock-obj-pub.xtensa-unknown-linux-gnu.h @@ -0,0 +1,24 @@ +## lock-obj-pub.or1k-unknown-linux-gnu.h +## File created by gen-posix-lock-obj - DO NOT EDIT +## To be included by mkheader into gpg-error.h + +typedef struct +{ + long _vers; + union { + volatile char _priv[32]; + long _x_align; + long *_xp_align; + } u; +} gpgrt_lock_t; + +#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ + 0,0,0,0,0,0,0,0, \ + 0,0,0,0,0,0,0,0, \ + 0,0,0,0,0,0,0,0}}} +## +## Local Variables: +## mode: c +## buffer-read-only: t +## End: +## -- cgit v1.2.3