From b68df93b3409fd2c862649982a1552462440b30a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 21 Dec 2015 16:53:57 +0100 Subject: libgpg-error: update to latest --- package/libgpg-error/Makefile | 7 +++-- package/libgpg-error/patches/patch-src_Makefile_in | 34 ---------------------- .../lock-obj-pub.arm-openadk-linux-uclibceabihf.h | 23 +++++++++++++++ 3 files changed, 27 insertions(+), 37 deletions(-) delete mode 100644 package/libgpg-error/patches/patch-src_Makefile_in create mode 100644 package/libgpg-error/src/src/syscfg/lock-obj-pub.arm-openadk-linux-uclibceabihf.h diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index e1695f0d2..6a82af05c 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -4,14 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libgpg-error -PKG_VERSION:= 1.12 -PKG_RELEASE:= 2 -PKG_HASH:= cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f +PKG_VERSION:= 1.21 +PKG_RELEASE:= 1 +PKG_HASH:= b7dbdb3cad63a740e9f0c632a1da32d4afdb694ec86c8625c98ea0691713b84d PKG_DESCR:= helper library for common error codes and descriptions PKG_SECTION:= libs/misc PKG_URL:= http://www.gnupg.org/ PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ PKG_OPTS:= dev +PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/libgpg-error/patches/patch-src_Makefile_in b/package/libgpg-error/patches/patch-src_Makefile_in deleted file mode 100644 index f33ffcfb7..000000000 --- a/package/libgpg-error/patches/patch-src_Makefile_in +++ /dev/null @@ -1,34 +0,0 @@ ---- libgpg-error-1.12.orig/src/Makefile.in 2013-06-24 06:42:26.000000000 +0200 -+++ libgpg-error-1.12/src/Makefile.in 2015-11-08 22:40:50.500389023 +0100 -@@ -192,6 +192,7 @@ BUILD_TIMESTAMP = @BUILD_TIMESTAMP@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CC_FOR_BUILD = @CC_FOR_BUILD@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ -@@ -979,7 +980,7 @@ code-to-errno.h: Makefile mkerrnos.awk e - # It is correct to use $(CPP). We want the host's idea of the error codes. - mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers) - $(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@ -- $(CPP) $(CPPFLAGS) $(extra_cppflags) _$@ | grep GPG_ERR_ | \ -+ $(CPP) $(CPPFLAGS) $(extra_cppflags) -P _$@ | grep GPG_ERR_ | \ - $(AWK) -f $(srcdir)/mkerrcodes.awk >$@ - -rm _$@ - -@@ -1006,12 +1007,12 @@ gpg-error.def: Makefile gpg-error.def.in - # It is correct to use $(CC_FOR_BUILD) here. We want to run the - # program at build time. - mkerrcodes: mkerrcodes.c mkerrcodes.h Makefile -- $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c - - # It is correct to use $(CC_FOR_BUILD) here. We want to run the - # program at build time. - @HAVE_W32CE_SYSTEM_TRUE@mkw32errmap: mkw32errmap.c mkw32errmap.tab.h Makefile --@HAVE_W32CE_SYSTEM_TRUE@ $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c -+@HAVE_W32CE_SYSTEM_TRUE@ $(CC_FOR_BUILD) $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c - - code-from-errno.h: mkerrcodes Makefile - ./mkerrcodes | $(AWK) -f $(srcdir)/mkerrcodes2.awk >$@ diff --git a/package/libgpg-error/src/src/syscfg/lock-obj-pub.arm-openadk-linux-uclibceabihf.h b/package/libgpg-error/src/src/syscfg/lock-obj-pub.arm-openadk-linux-uclibceabihf.h new file mode 100644 index 000000000..66364000d --- /dev/null +++ b/package/libgpg-error/src/src/syscfg/lock-obj-pub.arm-openadk-linux-uclibceabihf.h @@ -0,0 +1,23 @@ +## lock-obj-pub.arm-unknown-linux-gnueabihf.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[24]; + 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}}} +## +## Local Variables: +## mode: c +## buffer-read-only: t +## End: +## -- cgit v1.2.3