diff options
| author |   Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2015-06-09 12:36:52 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-11 23:56:30 +0100 |
| commit | c263dc742c0c4729be51dad8eefc0b2699b071d9 (patch) | |
| tree | e91b169b493619be6966d7ab32dab5b95c857d65 /meta/recipes-support/libgpg-error/libgpg-error | |
| parent | 032402438befd5906d05fed843bab9520bf7fc3e (diff) | |
| download | openembedded-core-contrib-c263dc742c0c4729be51dad8eefc0b2699b071d9.tar.gz | |
libgpg-error: Upgrade 1.18 -> 1.19
The patch pkgconfig.patch has not being integrated into upstream
repository, so rebasing it. Another change occurred inside the recipe,
the TUPLE's name changed for i586/i686 target architectures.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support/libgpg-error/libgpg-error')
| -rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 96476badaa..9ffeedbe5a 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch @@ -9,9 +9,9 @@ Index: libgpg-error-1.17/configure.ac =================================================================== --- libgpg-error-1.17.orig/configure.ac +++ libgpg-error-1.17/configure.ac -@@ -521,6 +521,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make +@@ -529,6 +529,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) - AC_CONFIG_FILES([src/versioninfo.rc]) + AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest]) AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) +AC_CONFIG_FILES([src/gpg-error.pc]) @@ -21,7 +21,7 @@ Index: libgpg-error-1.17/src/Makefile.am =================================================================== --- libgpg-error-1.17.orig/src/Makefile.am +++ libgpg-error-1.17/src/Makefile.am -@@ -74,13 +74,15 @@ nodist_include_HEADERS = gpg-error.h +@@ -75,6 +75,8 @@ nodist_include_HEADERS = gpg-error.h bin_SCRIPTS = gpg-error-config m4datadir = $(datadir)/aclocal m4data_DATA = gpg-error.m4 @@ -30,30 +30,15 @@ Index: libgpg-error-1.17/src/Makefile.am EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkerrnos.awk errnos.in README \ - mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ +@@ -82,7 +84,7 @@ EXTRA_DIST = mkstrtable.awk err-sources. mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ -- gpg-error.vers gpg-error.def.in versioninfo.rc.in \ -+ gpg-error.vers gpg-error.def.in versioninfo.rc.in gpg-error.pc \ + gpg-error.vers gpg-error.def.in \ +- versioninfo.rc.in gpg-error.w32-manifest.in \ ++ versioninfo.rc.in gpg-error.w32-manifest.in gpg-error.pc \ $(lock_obj_pub) BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ -Index: libgpg-error-1.17/src/gpg-error.pc.in -=================================================================== ---- /dev/null -+++ libgpg-error-1.17/src/gpg-error.pc.in -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+host=@GPG_ERROR_CONFIG_HOST@ -+ -+Name: gpg-error -+Description: a library that defines common error values for all GnuPG components -+Version: @VERSION@ -+Libs: -L${libdir} -lgpg-error -+Cflags: -I${includedir} Index: libgpg-error-1.17/src/gpg-error.m4 =================================================================== --- libgpg-error-1.17.orig/src/gpg-error.m4 @@ -147,3 +132,19 @@ Index: libgpg-error-1.17/src/gpg-error.m4 ifelse([$3], , :, [$3]) fi AC_SUBST(GPG_ERROR_CFLAGS) +Index: libgpg-error-1.17/src/gpg-error.pc.in +=================================================================== +--- /dev/null ++++ libgpg-error-1.17/src/gpg-error.pc.in +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++host=@GPG_ERROR_CONFIG_HOST@ ++ ++Name: gpg-error ++Description: a library that defines common error values for all GnuPG components ++Version: @VERSION@ ++Libs: -L${libdir} -lgpg-error ++Cflags: -I${includedir} |