summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2012-12-03 18:17:31 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:12 +0000
commit60fc9a9ef98814f7d9e848f3c4656ab719541610 (patch)
tree9b7a8abb8b4ea1d8bbaf2e0880a263fc8fba21cf /meta
parentd20c23db7c21990ec8e7d9a44e755d7fa4a627e8 (diff)
downloadpoky-60fc9a9ef98814f7d9e848f3c4656ab719541610.tar.gz
libksba: add pkgconfig support
Add pkgconfig support to libksba. [YOCTO #2453] (From OE-Core rev: d155ab2277c9ff2778f650a2acefee9b717e3d8f) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 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/libksba/libksba/ksba-add-pkgconfig-support.patch59
-rw-r--r--meta/recipes-support/libksba/libksba_1.3.0.bb8
2 files changed, 64 insertions, 3 deletions
diff --git a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
new file mode 100644
index 0000000000..fe1ec0ff2f
--- /dev/null
+++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
@@ -0,0 +1,59 @@
1Upstream-Status: Rejected
2
3Add pkgconfig support to libksba.
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,6 +21,9 @@
14 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
15 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
16
17+pkgconfigdir = ${libdir}/pkgconfig
18+pkgconfig_DATA = ksba.pc
19+
20 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
21 GITLOG_TO_CHANGELOG=gitlog-to-changelog
22
23Index: configure.ac
24===============================================================
25--- a/configure.ac
26+++ b/configure.ac
27@@ -399,6 +399,7 @@ m4/Makefile
28 gl/Makefile
29 src/Makefile
30 src/ksba-config
31 src/versioninfo.rc
32+ksba.pc
33 tests/Makefile
34 doc/Makefile
35
36Index: src/ksba.pc.in
37===============================================================
38--- /dev/null
39+++ b/ksba.pc.in
40@@ -0,0 +1,16 @@
41+prefix=@prefix@
42+exec_prefix=@exec_prefix@
43+libdir=@libdir@
44+includedir=@includedir@
45+
46+# API info
47+api_version=@KSBA_CONFIG_API_VERSION@
48+
49+Name: ksba
50+Description: Libksba provides an easy API to create and parse X.509 and CMS related objects
51+Requires:
52+Version: @VERSION@
53+Libs: -L${libdir} -lksba
54+Libs.private: -L{libdir} -lgpg-error
55+Cflags: -I${includedir}
56+
57--
581.7.5.4
59
diff --git a/meta/recipes-support/libksba/libksba_1.3.0.bb b/meta/recipes-support/libksba/libksba_1.3.0.bb
index 506d7c00b4..45bc35a4c1 100644
--- a/meta/recipes-support/libksba/libksba_1.3.0.bb
+++ b/meta/recipes-support/libksba/libksba_1.3.0.bb
@@ -6,13 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fd541d83f75d038c4e0617b672ed8bda \
6 file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ 6 file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \
7 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 7 file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
8 " 8 "
9PR = "r0" 9PR = "r1"
10 10
11DEPENDS = "libgpg-error" 11DEPENDS = "libgpg-error"
12 12
13inherit autotools binconfig 13inherit autotools binconfig pkgconfig
14 14
15SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2" 15SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
16 file://ksba-add-pkgconfig-support.patch"
16 17
17SRC_URI[md5sum] = "cd86fad9c9d360b2cf80449f8a4a4075" 18SRC_URI[md5sum] = "cd86fad9c9d360b2cf80449f8a4a4075"
18SRC_URI[sha256sum] = "5a61eed50550d4d0dcb47457ce7b6a90f8e719d42a3b25f7e79333e8cd721971" 19SRC_URI[sha256sum] = "5a61eed50550d4d0dcb47457ce7b6a90f8e719d42a3b25f7e79333e8cd721971"
20