summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2015-06-09 12:36:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:17 +0100
commit8db97b59914a38f4550b47fa4374a2d4312aec06 (patch)
tree5fa3c0e6fca16f69195537f430251c215d5b6262 /meta
parentb108e3e2df6b6e844d6768e793f292c74347eee5 (diff)
downloadpoky-8db97b59914a38f4550b47fa4374a2d4312aec06.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. (From OE-Core rev: c263dc742c0c4729be51dad8eefc0b2699b071d9) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch45
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.19.bb (renamed from meta/recipes-support/libgpg-error/libgpg-error_1.18.bb)6
2 files changed, 26 insertions, 25 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
9=================================================================== 9===================================================================
10--- libgpg-error-1.17.orig/configure.ac 10--- libgpg-error-1.17.orig/configure.ac
11+++ libgpg-error-1.17/configure.ac 11+++ libgpg-error-1.17/configure.ac
12@@ -521,6 +521,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make 12@@ -529,6 +529,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make
13 AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) 13 AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd])
14 AC_CONFIG_FILES([src/versioninfo.rc]) 14 AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest])
15 AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) 15 AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
16+AC_CONFIG_FILES([src/gpg-error.pc]) 16+AC_CONFIG_FILES([src/gpg-error.pc])
17 17
@@ -21,7 +21,7 @@ Index: libgpg-error-1.17/src/Makefile.am
21=================================================================== 21===================================================================
22--- libgpg-error-1.17.orig/src/Makefile.am 22--- libgpg-error-1.17.orig/src/Makefile.am
23+++ libgpg-error-1.17/src/Makefile.am 23+++ libgpg-error-1.17/src/Makefile.am
24@@ -74,13 +74,15 @@ nodist_include_HEADERS = gpg-error.h 24@@ -75,6 +75,8 @@ nodist_include_HEADERS = gpg-error.h
25 bin_SCRIPTS = gpg-error-config 25 bin_SCRIPTS = gpg-error-config
26 m4datadir = $(datadir)/aclocal 26 m4datadir = $(datadir)/aclocal
27 m4data_DATA = gpg-error.m4 27 m4data_DATA = gpg-error.m4
@@ -30,30 +30,15 @@ Index: libgpg-error-1.17/src/Makefile.am
30 30
31 EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ 31 EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
32 mkerrnos.awk errnos.in README \ 32 mkerrnos.awk errnos.in README \
33 mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ 33@@ -82,7 +84,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.
34 mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ 34 mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \
35 err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ 35 err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \
36- gpg-error.vers gpg-error.def.in versioninfo.rc.in \ 36 gpg-error.vers gpg-error.def.in \
37+ gpg-error.vers gpg-error.def.in versioninfo.rc.in gpg-error.pc \ 37- versioninfo.rc.in gpg-error.w32-manifest.in \
38+ versioninfo.rc.in gpg-error.w32-manifest.in gpg-error.pc \
38 $(lock_obj_pub) 39 $(lock_obj_pub)
39 40
40 BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ 41 BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
41Index: libgpg-error-1.17/src/gpg-error.pc.in
42===================================================================
43--- /dev/null
44+++ libgpg-error-1.17/src/gpg-error.pc.in
45@@ -0,0 +1,11 @@
46+prefix=@prefix@
47+exec_prefix=@exec_prefix@
48+libdir=@libdir@
49+includedir=@includedir@
50+host=@GPG_ERROR_CONFIG_HOST@
51+
52+Name: gpg-error
53+Description: a library that defines common error values for all GnuPG components
54+Version: @VERSION@
55+Libs: -L${libdir} -lgpg-error
56+Cflags: -I${includedir}
57Index: libgpg-error-1.17/src/gpg-error.m4 42Index: libgpg-error-1.17/src/gpg-error.m4
58=================================================================== 43===================================================================
59--- libgpg-error-1.17.orig/src/gpg-error.m4 44--- libgpg-error-1.17.orig/src/gpg-error.m4
@@ -147,3 +132,19 @@ Index: libgpg-error-1.17/src/gpg-error.m4
147 ifelse([$3], , :, [$3]) 132 ifelse([$3], , :, [$3])
148 fi 133 fi
149 AC_SUBST(GPG_ERROR_CFLAGS) 134 AC_SUBST(GPG_ERROR_CFLAGS)
135Index: libgpg-error-1.17/src/gpg-error.pc.in
136===================================================================
137--- /dev/null
138+++ libgpg-error-1.17/src/gpg-error.pc.in
139@@ -0,0 +1,11 @@
140+prefix=@prefix@
141+exec_prefix=@exec_prefix@
142+libdir=@libdir@
143+includedir=@includedir@
144+host=@GPG_ERROR_CONFIG_HOST@
145+
146+Name: gpg-error
147+Description: a library that defines common error values for all GnuPG components
148+Version: @VERSION@
149+Libs: -L${libdir} -lgpg-error
150+Cflags: -I${includedir}
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.18.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb
index c9a47a3573..39dbbcf337 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.18.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb
@@ -13,8 +13,8 @@ SECTION = "libs"
13 13
14SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ 14SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
15 file://pkgconfig.patch" 15 file://pkgconfig.patch"
16SRC_URI[md5sum] = "12312802d2065774b787cbfc22cc04e9" 16SRC_URI[md5sum] = "c04c16245b92829281f43b5bef7d16da"
17SRC_URI[sha256sum] = "9ff1d6e61d4cef7c1d0607ceef6d40dc33f3da7a3094170c3718c00153d80810" 17SRC_URI[sha256sum] = "53120e1333d5c5d28d87ff2854e9e98719c8e214152f17ad5291704d25c4978b"
18 18
19BINCONFIG = "${bindir}/gpg-error-config" 19BINCONFIG = "${bindir}/gpg-error-config"
20 20
@@ -30,7 +30,7 @@ do_compile_prepend() {
30 aarch64_be) TUPLE=aarch64-unknown-linux-gnu ;; 30 aarch64_be) TUPLE=aarch64-unknown-linux-gnu ;;
31 arm) TUPLE=arm-unknown-linux-gnueabi ;; 31 arm) TUPLE=arm-unknown-linux-gnueabi ;;
32 armeb) TUPLE=arm-unknown-linux-gnueabi ;; 32 armeb) TUPLE=arm-unknown-linux-gnueabi ;;
33 i586|i686) TUPLE=i486-pc-linux-gnu ;; 33 i586|i686) TUPLE=i686-pc-linux-gnu ;;
34 mips64el) TUPLE=mipsel-unknown-linux-gnu ;; 34 mips64el) TUPLE=mipsel-unknown-linux-gnu ;;
35 mips64) TUPLE=mips-unknown-linux-gnu ;; 35 mips64) TUPLE=mips-unknown-linux-gnu ;;
36 x86_64) TUPLE=x86_64-pc-linux-gnu ;; 36 x86_64) TUPLE=x86_64-pc-linux-gnu ;;