diff options
Diffstat (limited to 'package/libgpg-error')
4 files changed, 38 insertions, 93 deletions
diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index 418efe7c5..c9d50ca65 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.28 +PKG_VERSION:= 1.47 PKG_RELEASE:= 1 -PKG_HASH:= 3edb957744905412f30de3e25da18682cbe509541e18cd3b8f9df695a075da49 +PKG_HASH:= 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb PKG_DESCR:= helper library for common error codes and descriptions PKG_SECTION:= libs/misc PKG_URL:= http://www.gnupg.org/ @@ -54,16 +54,24 @@ ifeq ($(ADK_TARGET_ARCH_SPARC64),y) LIBGPG_PREFIX:= sparc64-unknown-linux-gnu endif ifeq ($(ADK_TARGET_ARCH_X86),y) -LIBGPG_PREFIX:= i686-pc-linux-gnu +LIBGPG_PREFIX:= i686-unknown-linux-gnu endif ifeq ($(ADK_TARGET_ARCH_X86_64),y) -LIBGPG_PREFIX:= x86_64-pc-linux-gnu +LIBGPG_PREFIX:= x86_64-unknown-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 && \ + cd $(WRKSRC)/src/syscfg && ( \ + ln -s lock-obj-pub.$(LIBGPG_PREFIX).h \ + lock-obj-pub.$(GNU_TARGET_NAME).h ; \ ln -s lock-obj-pub.$(LIBGPG_PREFIX).h \ - lock-obj-pub.$(GNU_TARGET_NAME).h + lock-obj-pub.$(ADK_TARGET_LINUXTYPE)-$(ADK_TARGET_SUFFIX).h ) libgpg-error-install: ${INSTALL_DIR} ${IDIR_LIBGPG_ERROR}/usr/lib diff --git a/package/libgpg-error/patches/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch b/package/libgpg-error/patches/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch deleted file mode 100644 index 3abf3ab49..000000000 --- a/package/libgpg-error/patches/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 791177de023574223eddf7288eb7c5a0721ac623 Mon Sep 17 00:00:00 2001 -From: Werner Koch <wk@gnupg.org> -Date: Sun, 18 Mar 2018 17:39:43 +0100 -Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list. - -* src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of -NULL. --- - -Fix -Suggested-by: Jakub Wilk <jwilk@jwilk.net> - -Signed-off-by: Werner Koch <wk@gnupg.org> ---- - src/logging.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/src/logging.c b/src/logging.c -index 1a4f620..d01f974 100644 ---- a/src/logging.c -+++ b/src/logging.c -@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void) - - - /* Print a hexdump of (BUFFER,LENGTH). With FMT passed as NULL print -- * just the raw dump, with FMT being an empty string, print a trailing -- * linefeed, otherwise print an entire debug line with the expanded -- * FMT followed by a possible wrapped hexdump and a final LF. */ -+ * just the raw dump (in this case ARG_PTR is not used), with FMT -+ * being an empty string, print a trailing linefeed, otherwise print -+ * an entire debug line with the expanded FMT followed by a possible -+ * wrapped hexdump and a final LF. */ - void - _gpgrt_logv_printhex (const void *buffer, size_t length, - const char *fmt, va_list arg_ptr) -@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length, - va_end (arg_ptr); - } - else -- _gpgrt_logv_printhex (buffer, length, NULL, NULL); -+ { -+ /* va_list is not necessary a pointer and thus we can't use NULL -+ * because that would conflict with platforms using a straight -+ * struct for it (e.g. arm64). We use a dummy variable instead; -+ * the static is a simple way zero it out so to not get -+ * complains about uninitialized use. */ -+ static va_list dummy_argptr; -+ -+ _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr); -+ } - } - - --- -2.16.2 - diff --git a/package/libgpg-error/patches/patch-configure b/package/libgpg-error/patches/patch-configure deleted file mode 100644 index ef5027984..000000000 --- a/package/libgpg-error/patches/patch-configure +++ /dev/null @@ -1,31 +0,0 @@ ---- libgpg-error-1.12.orig/configure 2013-06-24 06:42:28.000000000 +0200 -+++ libgpg-error-1.12/configure 2015-11-08 11:40:16.360212436 +0100 -@@ -670,6 +670,7 @@ MSGFMT - GETTEXT_MACRO_VERSION - USE_NLS - CC_FOR_BUILD -+CFLAGS_FOR_BUILD - RC - OTOOL64 - OTOOL -@@ -814,7 +815,8 @@ LDFLAGS - LIBS - CPPFLAGS - CPP --CC_FOR_BUILD' -+CC_FOR_BUILD -+CFLAGS_FOR_BUILD' - - - # Initialize some variables set by options. -@@ -12259,8 +12261,10 @@ CFLAGS=$lt_save_CFLAGS - $as_echo_n "checking for cc for build... " >&6; } - if test "$cross_compiling" = "yes"; then - CC_FOR_BUILD="${CC_FOR_BUILD-cc}" -+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}" - else - CC_FOR_BUILD="${CC_FOR_BUILD-$CC}" -+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-$CFLAGS}" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5 - $as_echo "$CC_FOR_BUILD" >&6; } 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: +## |