summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-08-29 08:26:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-31 23:40:48 +0100
commitd086917631c2ebc6cedab97864aa0ba22c5f88b1 (patch)
tree066d65b4b62a72b8d6ef6d7685a36e08b3f70713 /meta
parent83b4118151afd538a129110c583c86a13027bf00 (diff)
downloadpoky-d086917631c2ebc6cedab97864aa0ba22c5f88b1.tar.gz
libassuan: Upgrade to 2.1.2
(From OE-Core rev: 5d3c96339e43a777542fa696b300322adbb636e1) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch38
-rw-r--r--meta/recipes-support/libassuan/libassuan_2.1.2.bb (renamed from meta/recipes-support/libassuan/libassuan_2.1.1.bb)4
2 files changed, 21 insertions, 21 deletions
diff --git a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
index 4f968812c9..f130d85652 100644
--- a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
@@ -6,18 +6,18 @@ Upstream-Status: Rejected
6Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 6Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
7Signed-off-by: Constantin Musca <constantinx.musca@intel.com> 7Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
8 8
9Index: libassuan-2.1.1/Makefile.am 9Index: libassuan-2.1.2/Makefile.am
10=================================================================== 10===================================================================
11--- libassuan-2.1.1.orig/Makefile.am 2014-05-13 20:57:37.794398357 +0000 11--- libassuan-2.1.2.orig/Makefile.am
12+++ libassuan-2.1.1/Makefile.am 2014-05-13 20:57:37.790398357 +0000 12+++ libassuan-2.1.2/Makefile.am
13@@ -24,10 +24,13 @@ 13@@ -24,10 +24,13 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gz
14 # (A suitable gitlog-to-changelog script can be found in GnuPG master.) 14 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
15 GITLOG_TO_CHANGELOG=gitlog-to-changelog 15 GITLOG_TO_CHANGELOG=gitlog-to-changelog
16 16
17+pkgconfigdir = $(libdir)/pkgconfig 17+pkgconfigdir = $(libdir)/pkgconfig
18+pkgconfig_DATA = libassuan.pc 18+pkgconfig_DATA = libassuan.pc
19+ 19+
20 EXTRA_DIST = config.rpath autogen.sh README.GIT \ 20 EXTRA_DIST = autogen.sh autogen.rc README.GIT \
21 ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \ 21 ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \
22 tests/ChangeLog-2011 contrib/ChangeLog-2011 \ 22 tests/ChangeLog-2011 contrib/ChangeLog-2011 \
23- build-aux/git-log-footer build-aux/git-log-fix 23- build-aux/git-log-footer build-aux/git-log-fix
@@ -25,10 +25,10 @@ Index: libassuan-2.1.1/Makefile.am
25 25
26 SUBDIRS = m4 src doc tests 26 SUBDIRS = m4 src doc tests
27 27
28Index: libassuan-2.1.1/libassuan.pc.in 28Index: libassuan-2.1.2/libassuan.pc.in
29=================================================================== 29===================================================================
30--- /dev/null 1970-01-01 00:00:00.000000000 +0000 30--- /dev/null
31+++ libassuan-2.1.1/libassuan.pc.in 2014-05-13 20:57:37.790398357 +0000 31+++ libassuan-2.1.2/libassuan.pc.in
32@@ -0,0 +1,14 @@ 32@@ -0,0 +1,14 @@
33+prefix=@prefix@ 33+prefix=@prefix@
34+exec_prefix=@exec_prefix@ 34+exec_prefix=@exec_prefix@
@@ -44,11 +44,11 @@ Index: libassuan-2.1.1/libassuan.pc.in
44+Libs: -L${libdir} -lassuan 44+Libs: -L${libdir} -lassuan
45+Libs.private: -lgpg-error 45+Libs.private: -lgpg-error
46+Cflags: -I${includedir} 46+Cflags: -I${includedir}
47Index: libassuan-2.1.1/configure.ac 47Index: libassuan-2.1.2/configure.ac
48=================================================================== 48===================================================================
49--- libassuan-2.1.1.orig/configure.ac 2014-05-13 20:57:37.794398357 +0000 49--- libassuan-2.1.2.orig/configure.ac
50+++ libassuan-2.1.1/configure.ac 2014-05-13 20:57:37.790398357 +0000 50+++ libassuan-2.1.2/configure.ac
51@@ -434,7 +434,7 @@ 51@@ -439,7 +439,7 @@ AC_CONFIG_FILES([doc/Makefile])
52 AC_CONFIG_FILES([tests/Makefile]) 52 AC_CONFIG_FILES([tests/Makefile])
53 AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config]) 53 AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config])
54 AC_CONFIG_FILES([src/versioninfo.rc]) 54 AC_CONFIG_FILES([src/versioninfo.rc])
@@ -57,11 +57,11 @@ Index: libassuan-2.1.1/configure.ac
57 AC_OUTPUT 57 AC_OUTPUT
58 58
59 echo " 59 echo "
60Index: libassuan-2.1.1/src/libassuan.m4 60Index: libassuan-2.1.2/src/libassuan.m4
61=================================================================== 61===================================================================
62--- libassuan-2.1.1.orig/src/libassuan.m4 2011-04-06 15:37:26.000000000 +0000 62--- libassuan-2.1.2.orig/src/libassuan.m4
63+++ libassuan-2.1.1/src/libassuan.m4 2014-05-13 21:06:53.402395537 +0000 63+++ libassuan-2.1.2/src/libassuan.m4
64@@ -15,18 +15,6 @@ 64@@ -15,18 +15,6 @@ dnl Returns ok set to yes or no.
65 dnl 65 dnl
66 AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], 66 AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
67 [ AC_REQUIRE([AC_CANONICAL_HOST]) 67 [ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -80,7 +80,7 @@ Index: libassuan-2.1.1/src/libassuan.m4
80 80
81 tmp=ifelse([$1], ,1:0.9.2,$1) 81 tmp=ifelse([$1], ,1:0.9.2,$1)
82 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then 82 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
83@@ -37,51 +25,12 @@ 83@@ -37,51 +25,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
84 min_libassuan_version="$tmp" 84 min_libassuan_version="$tmp"
85 fi 85 fi
86 86
@@ -134,7 +134,7 @@ Index: libassuan-2.1.1/src/libassuan.m4
134 if test "$tmp" -gt 0 ; then 134 if test "$tmp" -gt 0 ; then
135 AC_MSG_CHECKING([LIBASSUAN API version]) 135 AC_MSG_CHECKING([LIBASSUAN API version])
136 if test "$req_libassuan_api" -eq "$tmp" ; then 136 if test "$req_libassuan_api" -eq "$tmp" ; then
137@@ -96,7 +45,7 @@ 137@@ -96,7 +45,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
138 138
139 if test $ok = yes; then 139 if test $ok = yes; then
140 if test x"$host" != x ; then 140 if test x"$host" != x ; then
@@ -143,7 +143,7 @@ Index: libassuan-2.1.1/src/libassuan.m4
143 if test x"$libassuan_config_host" != xnone ; then 143 if test x"$libassuan_config_host" != xnone ; then
144 if test x"$libassuan_config_host" != x"$host" ; then 144 if test x"$libassuan_config_host" != x"$host" ; then
145 AC_MSG_WARN([[ 145 AC_MSG_WARN([[
146@@ -137,12 +86,8 @@ 146@@ -137,12 +86,8 @@ dnl
147 AC_DEFUN([AM_PATH_LIBASSUAN], 147 AC_DEFUN([AM_PATH_LIBASSUAN],
148 [ _AM_PATH_LIBASSUAN_COMMON($1) 148 [ _AM_PATH_LIBASSUAN_COMMON($1)
149 if test $ok = yes; then 149 if test $ok = yes; then
diff --git a/meta/recipes-support/libassuan/libassuan_2.1.1.bb b/meta/recipes-support/libassuan/libassuan_2.1.2.bb
index d66023320d..6d89107f32 100644
--- a/meta/recipes-support/libassuan/libassuan_2.1.1.bb
+++ b/meta/recipes-support/libassuan/libassuan_2.1.2.bb
@@ -13,8 +13,8 @@ DEPENDS = "libgpg-error"
13SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2 \ 13SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2 \
14 file://libassuan-add-pkgconfig-support.patch" 14 file://libassuan-add-pkgconfig-support.patch"
15 15
16SRC_URI[md5sum] = "757243cc4a71b30ed8d8dbe784035d36" 16SRC_URI[md5sum] = "1dc4c3e1dbfb3939bfa2d72db8e136ba"
17SRC_URI[sha256sum] = "23e2d67779b88e90d29fe1df6b157109f1c2a647d0f1b2a0f4295bb3c0b2039d" 17SRC_URI[sha256sum] = "39f8a7c9349aaaf7ccd937b90660153ec4d2d4df2465018754e5bcae5b1db77b"
18 18
19BINCONFIG = "${bindir}/libassuan-config" 19BINCONFIG = "${bindir}/libassuan-config"
20 20