summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-10-28 13:24:26 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-07 23:35:12 +0000
commit9cfe52d36e874bba3f38c8cfc028864c212bbd7b (patch)
treee8471a645cff68056d169cf4b9866a282c333b3f
parent1a3afca79d1760ea6c5d8f6928b4aacd35e6765e (diff)
downloadpoky-9cfe52d36e874bba3f38c8cfc028864c212bbd7b.tar.gz
libgpg-error: Update to 1.17
Rebased the pkgconfig.patch Added do_compile_prepend() copy an architecture specific header file. (From OE-Core rev: f6866391934588136f6cfa2c58fb8593875eb6fd) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch (renamed from meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch)67
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.12.bb31
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.17.bb56
3 files changed, 98 insertions, 56 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
index 89c9d22bf2..96476badaa 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
@@ -5,11 +5,11 @@
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Index: libgpg-error-1.12/configure.ac 8Index: libgpg-error-1.17/configure.ac
9=================================================================== 9===================================================================
10--- libgpg-error-1.12.orig/configure.ac 2014-05-13 21:14:26.846393236 +0000 10--- libgpg-error-1.17.orig/configure.ac
11+++ libgpg-error-1.12/configure.ac 2014-05-13 21:14:26.926393236 +0000 11+++ libgpg-error-1.17/configure.ac
12@@ -217,6 +217,7 @@ 12@@ -521,6 +521,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])
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])
@@ -17,11 +17,11 @@ Index: libgpg-error-1.12/configure.ac
17 17
18 AC_OUTPUT 18 AC_OUTPUT
19 19
20Index: libgpg-error-1.12/src/Makefile.am 20Index: libgpg-error-1.17/src/Makefile.am
21=================================================================== 21===================================================================
22--- libgpg-error-1.12.orig/src/Makefile.am 2014-05-13 21:14:26.846393236 +0000 22--- libgpg-error-1.17.orig/src/Makefile.am
23+++ libgpg-error-1.12/src/Makefile.am 2014-05-13 21:14:26.934393236 +0000 23+++ libgpg-error-1.17/src/Makefile.am
24@@ -37,13 +37,15 @@ 24@@ -74,13 +74,15 @@ 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
@@ -31,17 +31,17 @@ Index: libgpg-error-1.12/src/Makefile.am
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 mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \
34 mkheader.awk 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.def.in versioninfo.rc.in 36- gpg-error.vers gpg-error.def.in versioninfo.rc.in \
37+ gpg-error.def.in versioninfo.rc.in gpg-error.pc.in 37+ gpg-error.vers gpg-error.def.in versioninfo.rc.in gpg-error.pc \
38 $(lock_obj_pub)
38 39
39 BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ 40 BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
40 err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h \ 41Index: libgpg-error-1.17/src/gpg-error.pc.in
41Index: libgpg-error-1.12/src/gpg-error.pc.in
42=================================================================== 42===================================================================
43--- /dev/null 1970-01-01 00:00:00.000000000 +0000 43--- /dev/null
44+++ libgpg-error-1.12/src/gpg-error.pc.in 2014-05-13 21:48:20.266382916 +0000 44+++ libgpg-error-1.17/src/gpg-error.pc.in
45@@ -0,0 +1,11 @@ 45@@ -0,0 +1,11 @@
46+prefix=@prefix@ 46+prefix=@prefix@
47+exec_prefix=@exec_prefix@ 47+exec_prefix=@exec_prefix@
@@ -54,11 +54,11 @@ Index: libgpg-error-1.12/src/gpg-error.pc.in
54+Version: @VERSION@ 54+Version: @VERSION@
55+Libs: -L${libdir} -lgpg-error 55+Libs: -L${libdir} -lgpg-error
56+Cflags: -I${includedir} 56+Cflags: -I${includedir}
57Index: libgpg-error-1.12/src/gpg-error.m4 57Index: libgpg-error-1.17/src/gpg-error.m4
58=================================================================== 58===================================================================
59--- libgpg-error-1.12.orig/src/gpg-error.m4 2014-05-13 21:45:02.038383922 +0000 59--- libgpg-error-1.17.orig/src/gpg-error.m4
60+++ libgpg-error-1.12/src/gpg-error.m4 2014-05-13 21:47:08.362383281 +0000 60+++ libgpg-error-1.17/src/gpg-error.m4
61@@ -15,58 +15,14 @@ 61@@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_wa
62 dnl 62 dnl
63 AC_DEFUN([AM_PATH_GPG_ERROR], 63 AC_DEFUN([AM_PATH_GPG_ERROR],
64 [ AC_REQUIRE([AC_CANONICAL_HOST]) 64 [ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -70,7 +70,7 @@ Index: libgpg-error-1.12/src/gpg-error.m4
70- AC_HELP_STRING([--with-libgpg-error-prefix=PFX], 70- AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
71- [prefix where GPG Error is installed (optional)]), 71- [prefix where GPG Error is installed (optional)]),
72- [gpg_error_config_prefix="$withval"]) 72- [gpg_error_config_prefix="$withval"])
73 73-
74- dnl Accept --with-gpg-error-prefix and make it work the same as 74- dnl Accept --with-gpg-error-prefix and make it work the same as
75- dnl --with-libgpg-error-prefix above, for backwards compatibility, 75- dnl --with-libgpg-error-prefix above, for backwards compatibility,
76- dnl but do not document this old, inconsistently-named option. 76- dnl but do not document this old, inconsistently-named option.
@@ -78,14 +78,27 @@ Index: libgpg-error-1.12/src/gpg-error.m4
78- [gpg_error_config_prefix="$withval"]) 78- [gpg_error_config_prefix="$withval"])
79+ min_gpg_error_version=ifelse([$1], ,0.0,$1) 79+ min_gpg_error_version=ifelse([$1], ,0.0,$1)
80 80
81- if test x$gpg_error_config_prefix != x ; then 81- if test x"${GPG_ERROR_CONFIG}" = x ; then
82- if test x${GPG_ERROR_CONFIG+set} != xset ; then 82- if test x"${gpg_error_config_prefix}" != x ; then
83- GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config 83- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
84- else
85- case "${SYSROOT}" in
86- /*)
87- if test -x "${SYSROOT}/bin/gpg-error-config" ; then
88- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
89- fi
90- ;;
91- '')
92- ;;
93- *)
94- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
95- ;;
96- esac
84- fi 97- fi
85- fi 98- fi
86+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no]) 99+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no])
87 100
88- AC_PATH_TOOL(GPG_ERROR_CONFIG, gpg-error-config, no) 101- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
89- min_gpg_error_version=ifelse([$1], ,0.0,$1) 102- min_gpg_error_version=ifelse([$1], ,0.0,$1)
90- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) 103- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
91- ok=no 104- ok=no
@@ -113,6 +126,8 @@ Index: libgpg-error-1.12/src/gpg-error.m4
113 if test $ok = yes; then 126 if test $ok = yes; then
114- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` 127- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
115- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` 128- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
129- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
130- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
116- AC_MSG_RESULT([yes ($gpg_error_config_version)]) 131- AC_MSG_RESULT([yes ($gpg_error_config_version)])
117 ifelse([$2], , :, [$2]) 132 ifelse([$2], , :, [$2])
118- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` 133- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
@@ -120,12 +135,14 @@ Index: libgpg-error-1.12/src/gpg-error.m4
120 if test x"$gpg_error_config_host" != xnone ; then 135 if test x"$gpg_error_config_host" != xnone ; then
121 if test x"$gpg_error_config_host" != x"$host" ; then 136 if test x"$gpg_error_config_host" != x"$host" ; then
122 AC_MSG_WARN([[ 137 AC_MSG_WARN([[
123@@ -80,9 +36,6 @@ 138@@ -107,11 +47,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
124 fi 139 fi
125 fi 140 fi
126 else 141 else
127- GPG_ERROR_CFLAGS="" 142- GPG_ERROR_CFLAGS=""
128- GPG_ERROR_LIBS="" 143- GPG_ERROR_LIBS=""
144- GPG_ERROR_MT_CFLAGS=""
145- GPG_ERROR_MT_LIBS=""
129- AC_MSG_RESULT(no) 146- AC_MSG_RESULT(no)
130 ifelse([$3], , :, [$3]) 147 ifelse([$3], , :, [$3])
131 fi 148 fi
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.12.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.12.bb
deleted file mode 100644
index af9574d8fd..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.12.bb
+++ /dev/null
@@ -1,31 +0,0 @@
1SUMMARY = "Small library that defines common error values for all GnuPG components"
2HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/"
3BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
4
5LICENSE = "GPLv2+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
7 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
8 file://src/gpg-error.h.in;endline=23;md5=6ac0378874589a44d53512b3786b4bc0 \
9 file://src/init.c;endline=20;md5=b69742f2a8827d494c6f6a4b1768416c"
10
11
12SECTION = "libs"
13
14SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
15 file://pkgconfig.patch"
16
17SRC_URI[md5sum] = "8f0eb41a344d19ac2aa9bd101dfb9ce6"
18SRC_URI[sha256sum] = "cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f"
19
20BINCONFIG = "${bindir}/gpg-error-config"
21
22inherit autotools binconfig-disabled pkgconfig gettext
23
24FILES_${PN}-dev += "${bindir}/gpg-error"
25
26do_install_append() {
27 # we don't have common lisp in OE
28 rm -rf "${D}${datadir}/common-lisp/"
29}
30
31BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.17.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.17.bb
new file mode 100644
index 0000000000..c905bd1eb1
--- /dev/null
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.17.bb
@@ -0,0 +1,56 @@
1SUMMARY = "Small library that defines common error values for all GnuPG components"
2HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/"
3BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
4
5LICENSE = "GPLv2+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
7 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
8 file://src/gpg-error.h.in;endline=23;md5=5dfe776dc8b62af093ddc859de6f494c \
9 file://src/init.c;endline=20;md5=8f5a9b59634f4aebcd0ec9d3ebd53bfe"
10
11
12SECTION = "libs"
13
14SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
15 file://pkgconfig.patch"
16
17SRC_URI[md5sum] = "b4f8d8b9ff14aed41f279aa844563539"
18SRC_URI[sha256sum] = "3ff4e5a71116eb862cd14185fcd282850927b8608e3b4186834fd940fbef57b5"
19
20BINCONFIG = "${bindir}/gpg-error-config"
21
22inherit autotools binconfig-disabled pkgconfig gettext
23
24do_compile_prepend() {
25 TARGET_FILE=linux-gnu
26 if [ ${TARGET_OS} != "linux" ]; then
27 TARGET_FILE=${TARGET_OS}
28 fi
29
30 case ${TARGET_ARCH} in
31 aarch64) TUPLE=aarch64-unknown-linux-gnu ;;
32 arm) TUPLE=arm-unknown-linux-gnueabi ;;
33 armeb) TUPLE=arm-unknown-linux-gnueabi ;;
34 i586) TUPLE=i486-pc-linux-gnu ;;
35 mipsel) TUPLE=mipsel-unknown-linux-gnu ;;
36 mips64el) TUPLE=mipsel-unknown-linux-gnu ;;
37 mips64) TUPLE=mips-unknown-linux-gnu ;;
38 mips) TUPLE=mips-unknown-linux-gnu ;;
39 powerpc64) TUPLE=powerpc64-unknown-linux-gnu ;;
40 powerpc) TUPLE=powerpc-unknown-linux-gnu ;;
41 sh4) TUPLE=sh4-unknown-linux-gnu ;;
42 x86_64) TUPLE=x86_64-pc-linux-gnu ;;
43 esac
44
45 cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \
46 ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h
47}
48
49do_install_append() {
50 # we don't have common lisp in OE
51 rm -rf "${D}${datadir}/common-lisp/"
52}
53
54FILES_${PN}-dev += "${bindir}/gpg-error"
55
56BBCLASSEXTEND = "native"