summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-02-25 18:57:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-28 23:15:52 +0000
commit3497b2995e0b026c2695d411ba817c60e011381a (patch)
treece7b74739b1662565a195b3f5301768c9131bbce
parent4d1792d5dfbe3c89ddf461c9ac2be3417fe0a542 (diff)
downloadpoky-3497b2995e0b026c2695d411ba817c60e011381a.tar.gz
libassuan: upgrade to 2.1.0
- license checksum change due to addition of "Copyright (C) 2001, 2002, 2012, 2013 g10 Code GmbH" libassuan-add-pkgconfig-support.patch: adapted to the new version (From OE-Core rev: 36c16c1037d6c319d06c78405594413d65a2821d) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch44
-rw-r--r--meta/recipes-support/libassuan/libassuan_2.1.0.bb (renamed from meta/recipes-support/libassuan/libassuan_2.0.3.bb)6
2 files changed, 24 insertions, 26 deletions
diff --git a/meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch b/meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch
index ba332527f1..ac1604fe0b 100644
--- a/meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch
@@ -1,18 +1,18 @@
1Upstream-Status: Rejected
2
3Add pkgconfig support to libassuan. 1Add pkgconfig support to libassuan.
4This patch is rejected by upstream for the reason below: 2This patch is rejected by upstream for the reason below:
5They think pkgconfig adds no portability and maintaining them is not worthwhile. 3They think pkgconfig adds no portability and maintaining them is not worthwhile.
6 4
5Upstream-Status: Rejected
7Signed-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>
8 8
9Index: Makefile.am 9Index: libassuan-2.1.0/Makefile.am
10============================================================== 10===================================================================
11--- a/Makefile.am 11--- libassuan-2.1.0.orig/Makefile.am
12+++ b/Makefile.am 12+++ libassuan-2.1.0/Makefile.am
13@@ -21,11 +21,14 @@ 13@@ -24,10 +24,13 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gz
14 ACLOCAL_AMFLAGS = -I m4 14 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
15 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip 15 GITLOG_TO_CHANGELOG=gitlog-to-changelog
16 16
17+pkgconfigdir = $(libdir)/pkgconfig 17+pkgconfigdir = $(libdir)/pkgconfig
18+pkgconfig_DATA = assuan.pc 18+pkgconfig_DATA = assuan.pc
@@ -20,16 +20,15 @@ Index: Makefile.am
20 EXTRA_DIST = config.rpath autogen.sh README.GIT \ 20 EXTRA_DIST = config.rpath autogen.sh 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/gitlog-to-changelog build-aux/git-log-footer \ 23- build-aux/git-log-footer build-aux/git-log-fix
24- build-aux/git-log-fix 24+ build-aux/git-log-footer build-aux/git-log-fix assuan.pc.in
25+ build-aux/git-log-fix assuan.pc.in
26 25
27 SUBDIRS = m4 src doc tests 26 SUBDIRS = m4 src doc tests
28 27
29Index: assuan.pc.in 28Index: libassuan-2.1.0/assuan.pc.in
30============================================================== 29===================================================================
31--- /dev/null 30--- /dev/null
32+++ b/assuan.pc.in 31+++ libassuan-2.1.0/assuan.pc.in
33@@ -0,0 +1,12 @@ 32@@ -0,0 +1,12 @@
34+prefix=@prefix@ 33+prefix=@prefix@
35+exec_prefix=@exec_prefix@ 34+exec_prefix=@exec_prefix@
@@ -43,17 +42,16 @@ Index: assuan.pc.in
43+Libs: -L${libdir} -lassuan 42+Libs: -L${libdir} -lassuan
44+Libs.private: -lgpg-error 43+Libs.private: -lgpg-error
45+Cflags: -I${includedir} 44+Cflags: -I${includedir}
46Index: configure.ac 45Index: libassuan-2.1.0/configure.ac
47============================================================== 46===================================================================
48--- a/configure.ac 47--- libassuan-2.1.0.orig/configure.ac
49+++ b/configure.ac 48+++ libassuan-2.1.0/configure.ac
50@@ -380,5 +380,5 @@ AC_CONFIG_FILES([doc/Makefile]) 49@@ -433,7 +433,7 @@ AC_CONFIG_FILES([doc/Makefile])
51 AC_CONFIG_FILES([tests/Makefile]) 50 AC_CONFIG_FILES([tests/Makefile])
52 AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config]) 51 AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config])
53 AC_CONFIG_FILES([src/versioninfo.rc]) 52 AC_CONFIG_FILES([src/versioninfo.rc])
54- 53-
55+AC_CONFIG_FILES([assuan.pc]) 54+AC_CONFIG_FILES([assuan.pc])
56 AC_OUTPUT 55 AC_OUTPUT
57-- 56
581.7.5.4 57 echo "
59
diff --git a/meta/recipes-support/libassuan/libassuan_2.0.3.bb b/meta/recipes-support/libassuan/libassuan_2.1.0.bb
index f0d7c9f4b6..0483560080 100644
--- a/meta/recipes-support/libassuan/libassuan_2.0.3.bb
+++ b/meta/recipes-support/libassuan/libassuan_2.1.0.bb
@@ -5,7 +5,7 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
5LICENSE = "GPLv3 & LGPLv2.1+" 5LICENSE = "GPLv3 & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
7 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 7 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
8 file://src/assuan.c;endline=20;md5=fbd7f2a44aab170430d59380f94f85f8 \ 8 file://src/assuan.c;endline=20;md5=0f465544183405055ec179869fc5b5ba \
9 file://src/assuan-defs.h;endline=20;md5=20cd55535260ca1779edae5c7b80b21e" 9 file://src/assuan-defs.h;endline=20;md5=20cd55535260ca1779edae5c7b80b21e"
10 10
11DEPENDS = "libgpg-error" 11DEPENDS = "libgpg-error"
@@ -13,7 +13,7 @@ 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] = "179d1918325fdb928c7bd90b8a514fc7" 16SRC_URI[md5sum] = "b3231eec8e567f4f9294474a387378f5"
17SRC_URI[sha256sum] = "bad5682374c76bcc0abb1a7a34c9557af6874a477500748e64a7d3def79cac1b" 17SRC_URI[sha256sum] = "a4c5bd3a0c2726e8bcc2ea8a3b15f7aae3bd92d4f85968f315fd3a75d101c267"
18 18
19inherit autotools binconfig pkgconfig 19inherit autotools binconfig pkgconfig