Patchwork [113/131] libassuan: Add new recipe (version 2.1.1) needed for upgraded gnupg

login
register
mail settings
Submitter christian.braunersorensen@prevas.dk
Date Jan. 14, 2014, 12:34 p.m.
Message ID <5efaa3c4f2b951eeedd354f5d87b29ed00379c16.1389702652.git.christian.braunersorensen@prevas.dk>
Download mbox | patch
Permalink /patch/310716/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

christian.braunersorensen@prevas.dk - Jan. 14, 2014, 12:34 p.m.
From: Christian Sørensen <christian.braunersorensen@prevas.dk>

Signed-off-by: Christian Sørensen <christian.braunersorensen@prevas.dk>
---
 .../files/libassuan-add-pkgconfig-support.patch    | 57 ++++++++++++++++++++++
 recipes/libassuan/libassuan.inc                    | 14 ++++++
 recipes/libassuan/libassuan_2.1.1.oe               | 13 +++++
 recipes/libassuan/libassuan_2.1.1.oe.sig           |  1 +
 4 files changed, 85 insertions(+)
 create mode 100644 recipes/libassuan/files/libassuan-add-pkgconfig-support.patch
 create mode 100644 recipes/libassuan/libassuan.inc
 create mode 100644 recipes/libassuan/libassuan_2.1.1.oe
 create mode 100644 recipes/libassuan/libassuan_2.1.1.oe.sig

Patch

diff --git a/recipes/libassuan/files/libassuan-add-pkgconfig-support.patch b/recipes/libassuan/files/libassuan-add-pkgconfig-support.patch
new file mode 100644
index 0000000..ac1604f
--- /dev/null
+++ b/recipes/libassuan/files/libassuan-add-pkgconfig-support.patch
@@ -0,0 +1,57 @@ 
+Add pkgconfig support to libassuan.
+This patch is rejected by upstream for the reason below:
+They think pkgconfig adds no portability and maintaining them is not worthwhile.
+
+Upstream-Status: Rejected
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+
+Index: libassuan-2.1.0/Makefile.am
+===================================================================
+--- libassuan-2.1.0.orig/Makefile.am
++++ libassuan-2.1.0/Makefile.am
+@@ -24,10 +24,13 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gz
+ # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
+ GITLOG_TO_CHANGELOG=gitlog-to-changelog
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = assuan.pc
++
+ EXTRA_DIST = config.rpath autogen.sh README.GIT                  	\
+              ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 	\
+              tests/ChangeLog-2011 contrib/ChangeLog-2011     		\
+-             build-aux/git-log-footer build-aux/git-log-fix
++             build-aux/git-log-footer build-aux/git-log-fix assuan.pc.in
+ 
+ SUBDIRS = m4 src doc tests
+ 
+Index: libassuan-2.1.0/assuan.pc.in
+===================================================================
+--- /dev/null
++++ libassuan-2.1.0/assuan.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: libassuan
++Description: IPC library used by GnuPG and GPGME
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -lassuan
++Libs.private: -lgpg-error
++Cflags: -I${includedir}
+Index: libassuan-2.1.0/configure.ac
+===================================================================
+--- libassuan-2.1.0.orig/configure.ac
++++ libassuan-2.1.0/configure.ac
+@@ -433,7 +433,7 @@ AC_CONFIG_FILES([doc/Makefile])
+ AC_CONFIG_FILES([tests/Makefile])
+ AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config])
+ AC_CONFIG_FILES([src/versioninfo.rc])
+-
++AC_CONFIG_FILES([assuan.pc])
+ AC_OUTPUT
+ 
+ echo "
diff --git a/recipes/libassuan/libassuan.inc b/recipes/libassuan/libassuan.inc
new file mode 100644
index 0000000..4a63a8f
--- /dev/null
+++ b/recipes/libassuan/libassuan.inc
@@ -0,0 +1,14 @@ 
+SUMMARY = "IPC library used by GnuPG and GPGME"
+HOMEPAGE = "http://www.gnupg.org/related_software/libassuan/"
+BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
+LICENSE = "GPLv3 & LGPLv2.1+"
+
+inherit autotools-autoreconf pkgconfig library auto-package-utils binconfig
+
+DEPENDS = "libgpg-error"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2"
+
+AUTO_PACKAGE_UTILS += "libassuan-config"
+DEPENDS_${PN} += "libc libgpg-error"
+RDEPENDS_${PN} += "libc libgpg-error"
diff --git a/recipes/libassuan/libassuan_2.1.1.oe b/recipes/libassuan/libassuan_2.1.1.oe
new file mode 100644
index 0000000..f169c09
--- /dev/null
+++ b/recipes/libassuan/libassuan_2.1.1.oe
@@ -0,0 +1,13 @@ 
+require libassuan.inc
+
+SRC_URI += "file://libassuan-add-pkgconfig-support.patch"
+
+LIBRARY_VERSION = "0"
+
+do_install[postfuncs] += "do_install_fix_path_error"
+do_install_fix_path_error() {
+	sed -i -e 's#\(gpg_error_libs=\"\).*\(-lgpg-error\"\)#\1\2#' \
+			${D}${bindir}/libassuan-config
+	sed -i -e 's#\(gpg_error_cflags=\"\).*\(\"\)#\1\2#' \
+			${D}${bindir}/libassuan-config
+}
diff --git a/recipes/libassuan/libassuan_2.1.1.oe.sig b/recipes/libassuan/libassuan_2.1.1.oe.sig
new file mode 100644
index 0000000..620f03f
--- /dev/null
+++ b/recipes/libassuan/libassuan_2.1.1.oe.sig
@@ -0,0 +1 @@ 
+8bd3826de30651eb8f9b8673e2edff77cd70aca1  libassuan-2.1.1.tar.bz2