diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-11-09 22:04:57 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-11-09 22:05:40 +0100 |
| commit | bbc6e172ae9ddde307fc0f58682b18ea791cb554 (patch) | |
| tree | 78e8a2d9879df26b329feb4f91721458ac20a4d6 /package | |
| parent | 84f7a0c034e82d249a64da75843a3f2e107a9c32 (diff) | |
libgpg-error: fix gcc5.x compile
Diffstat (limited to 'package')
| -rw-r--r-- | package/libgpg-error/Makefile | 2 | ||||
| -rw-r--r-- | package/libgpg-error/patches/patch-configure | 12 | ||||
| -rw-r--r-- | package/libgpg-error/patches/patch-src_Makefile_in | 17 |
3 files changed, 20 insertions, 11 deletions
diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index 3afcfba68..e1695f0d2 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libgpg-error PKG_VERSION:= 1.12 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f PKG_DESCR:= helper library for common error codes and descriptions PKG_SECTION:= libs/misc diff --git a/package/libgpg-error/patches/patch-configure b/package/libgpg-error/patches/patch-configure index 717b884db..ef5027984 100644 --- a/package/libgpg-error/patches/patch-configure +++ b/package/libgpg-error/patches/patch-configure @@ -1,14 +1,14 @@ ---- libgpg-error-1.9.orig/configure 2010-07-21 10:00:02.000000000 +0200 -+++ libgpg-error-1.9/configure 2011-02-05 15:47:20.000000000 +0100 -@@ -769,6 +769,7 @@ GMSGFMT - MSGFMT +--- 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 -@@ -909,7 +910,8 @@ LDFLAGS +@@ -814,7 +815,8 @@ LDFLAGS LIBS CPPFLAGS CPP @@ -18,7 +18,7 @@ # Initialize some variables set by options. -@@ -11290,8 +11292,10 @@ CC="$lt_save_CC" +@@ -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}" diff --git a/package/libgpg-error/patches/patch-src_Makefile_in b/package/libgpg-error/patches/patch-src_Makefile_in index d19b518db..f33ffcfb7 100644 --- a/package/libgpg-error/patches/patch-src_Makefile_in +++ b/package/libgpg-error/patches/patch-src_Makefile_in @@ -1,6 +1,6 @@ ---- libgpg-error-1.9.orig/src/Makefile.in 2010-07-21 10:00:00.000000000 +0200 -+++ libgpg-error-1.9/src/Makefile.in 2011-02-05 15:44:54.000000000 +0100 -@@ -149,6 +149,7 @@ BUILD_TIMESTAMP = @BUILD_TIMESTAMP@ +--- 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@ @@ -8,7 +8,16 @@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -@@ -868,12 +869,12 @@ gpg-error.def: Makefile gpg-error.def.in +@@ -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 |