summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch59
-rw-r--r--meta/recipes-support/libassuan/libassuan_2.0.3.bb5
2 files changed, 62 insertions, 2 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
new file mode 100644
index 0000000000..ba332527f1
--- /dev/null
+++ b/meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch
@@ -0,0 +1,59 @@
1Upstream-Status: Rejected
2
3Add pkgconfig support to libassuan.
4This patch is rejected by upstream for the reason below:
5They think pkgconfig adds no portability and maintaining them is not worthwhile.
6
7Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
8
9Index: Makefile.am
10==============================================================
11--- a/Makefile.am
12+++ b/Makefile.am
13@@ -21,11 +21,14 @@
14 ACLOCAL_AMFLAGS = -I m4
15 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
16
17+pkgconfigdir = $(libdir)/pkgconfig
18+pkgconfig_DATA = assuan.pc
19+
20 EXTRA_DIST = config.rpath autogen.sh README.GIT \
21 ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \
22 tests/ChangeLog-2011 contrib/ChangeLog-2011 \
23 build-aux/gitlog-to-changelog build-aux/git-log-footer \
24- build-aux/git-log-fix
25+ build-aux/git-log-fix assuan.pc.in
26
27 SUBDIRS = m4 src doc tests
28
29Index: assuan.pc.in
30==============================================================
31--- /dev/null
32+++ b/assuan.pc.in
33@@ -0,0 +1,12 @@
34+prefix=@prefix@
35+exec_prefix=@exec_prefix@
36+libdir=@libdir@
37+includedir=@includedir@
38+
39+Name: libassuan
40+Description: IPC library used by GnuPG and GPGME
41+Requires:
42+Version: @VERSION@
43+Libs: -L${libdir} -lassuan
44+Libs.private: -lgpg-error
45+Cflags: -I${includedir}
46Index: configure.ac
47==============================================================
48--- a/configure.ac
49+++ b/configure.ac
50@@ -380,5 +380,5 @@ AC_CONFIG_FILES([doc/Makefile])
51 AC_CONFIG_FILES([tests/Makefile])
52 AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config])
53 AC_CONFIG_FILES([src/versioninfo.rc])
54-
55+AC_CONFIG_FILES([assuan.pc])
56 AC_OUTPUT
57--
581.7.5.4
59
diff --git a/meta/recipes-support/libassuan/libassuan_2.0.3.bb b/meta/recipes-support/libassuan/libassuan_2.0.3.bb
index 2a8963ec0a..f0d7c9f4b6 100644
--- a/meta/recipes-support/libassuan/libassuan_2.0.3.bb
+++ b/meta/recipes-support/libassuan/libassuan_2.0.3.bb
@@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
10 10
11DEPENDS = "libgpg-error" 11DEPENDS = "libgpg-error"
12 12
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 15
15SRC_URI[md5sum] = "179d1918325fdb928c7bd90b8a514fc7" 16SRC_URI[md5sum] = "179d1918325fdb928c7bd90b8a514fc7"
16SRC_URI[sha256sum] = "bad5682374c76bcc0abb1a7a34c9557af6874a477500748e64a7d3def79cac1b" 17SRC_URI[sha256sum] = "bad5682374c76bcc0abb1a7a34c9557af6874a477500748e64a7d3def79cac1b"
17 18
18inherit autotools binconfig 19inherit autotools binconfig pkgconfig