Add pkgconfig support to four packages
cover Add pkgconfig support to four packages
From: Chen Qi <[email protected]>
We have 26 recipes / packages that deliver *-config tools for development, these packages should deliver pkgconfig (.pc) files instead. Among these 26 recipes / packages, only four of them don't deliver pkgconfig (.pc) files. So we add pkgconfig support for these four packages.
The following changes since commit 0d7d413d64bab8d3c758414c6c8c653ccc325653:
build-appliance-image: Update to dee77eca39f406f90e60d9c5ef7a66fcc8f57dbf commit (2012-11-21 20:40:43 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/pkgconfig
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/pkgconfig
Chen Qi (4):
libksba: add pkgconfig support
icu: add pkgconfig support
pth: add pkgconfig support
libassuan: add pkgconfig support
.../icu/files/icu-add-pkgconfig-support.patch | 40 ++++++++++++++++++ meta/recipes-support/icu/icu-3.6.inc | 11 +++++ meta/recipes-support/icu/icu_3.6.bb | 2 +- .../files/libassuan-add-pkgconfig-support.patch | 33 +++++++++++++++ meta/recipes-support/libassuan/libassuan_2.0.3.bb | 10 ++++- .../libksba/ksba-add-pkgconfig-support.patch | 40 ++++++++++++++++++ meta/recipes-support/libksba/libksba_1.3.0.bb | 13 ++++-- .../pth/files/pth-add-pkgconfig-support.patch | 44 ++++++++++++++++++++ meta/recipes-support/pth/pth_2.0.7.bb | 12 ++++-- 9 files changed, 196 insertions(+), 9 deletions(-) create mode 100644 meta/recipes-support/icu/files/icu-add-pkgconfig-support.patch create mode 100644 meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch create mode 100644 meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch create mode 100644 meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch
Signature · 1 line
1.7.9.5
PATCH 1/4 libksba: add pkgconfig support
From: Chen Qi <[email protected]>
Add pkgconfig support to libksba.
[YOCTO# 2453]
--- .../libksba/ksba-add-pkgconfig-support.patch | 40 ++++++++++++++++++++ meta/recipes-support/libksba/libksba_1.3.0.bb | 13 +++++-- 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch new file +40 -0
@@ -0,0 +1,40 @@ +Upstream-Status: Inappropriate [distribution] + +Index: libksba-1.3.0/configure.ac +==================================================================== +--- libksba-1.3.0/configure.ac ++++ libksba-1.3.0/configure.ac +@@ -391,6 +391,7 @@ m4/Makefile + gl/Makefile + src/Makefile + src/ksba-config ++src/ksba.pc + src/versioninfo.rc + tests/Makefile + doc/Makefile + +Index: libksba-1.3.0/src/ksba.pc.in +==================================================================== +--- /dev/null ++++ libksba-1.3.0/src/ksba.pc.in +@@ -0,0 +1,17 @@ ++# Process this file with autoconf to produce a pkg-config metadata file. ++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++# API info ++api_version=@KSBA_CONFIG_API_VERSION@ ++ ++Name: ksba ++Description: Libksba provides an easy API to create and parse X.509 and CMS related objects ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -lksba ++Libs.private: -L{libdir} -lgpg-error ++Cflags: -I${includedir} +-- +1.7.11.2 +
meta/recipes-support/libksba/libksba_1.3.0.bb +10 -3
@@ -6,13 +6,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fd541d83f75d038c4e0617b672ed8bda \ file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -PR = "r0" +PR = "r1" DEPENDS = "libgpg-error" -inherit autotools binconfig +inherit autotools binconfig pkgconfig -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \ + file://ksba-add-pkgconfig-support.patch" SRC_URI[md5sum] = "cd86fad9c9d360b2cf80449f8a4a4075" SRC_URI[sha256sum] = "5a61eed50550d4d0dcb47457ce7b6a90f8e719d42a3b25f7e79333e8cd721971" + +# ksba.pc is added locally and thus installed here +do_install_append() { + install -d ${D}/${libdir}/pkgconfig + install -m 0644 ${S}/src/ksba.pc ${D}/${libdir}/pkgconfig/ +}
Signature · 1 line
1.7.9.5
PATCH 2/4 icu: add pkgconfig support
In reply to [email protected]From: Chen Qi <[email protected]>
Add pkgconfig support to icu.
[YOCTO# 2453]
--- .../icu/files/icu-add-pkgconfig-support.patch | 40 ++++++++++++++++++++ meta/recipes-support/icu/icu-3.6.inc | 11 ++++++ meta/recipes-support/icu/icu_3.6.bb | 2 +- 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/icu/files/icu-add-pkgconfig-support.patch
meta/recipes-support/icu/files/icu-add-pkgconfig-support.patch new file +40 -0
@@ -0,0 +1,40 @@ +Upstream-Status: Inappropriate [distribution] + +Signed-off-by: Chen Qi <[email protected]> + +Index: configure.in +============================================================= +--- a/configure.in ++++ b/configure.in +@@ -1057,4 +1057,7 @@ echo "This may cause ICU to fail to build. Please make sure that GNU make" + echo "is in your PATH so that this configure script can detect its location." + fi + ++AC_CONFIG_FILES([icu.pc]) ++AC_OUTPUT ++ + $as_unset _CXX_CXXSUFFIX + +Index: icu.pc.in +============================================================= +--- /dev/null ++++ b/icu.pc.in +@@ -0,0 +1,15 @@ ++# Process this file with autoconf to produce a pkg-config metadata file. ++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++unicode_version=@UNICODE_VERSION@ ++ ++Name: ICU ++Description: International Component for Unicode libraries ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -licui18n -licuuc -licudata ++Libs.private: -L{libdir} -lpthread -lm ++Cflags: -I${includedir} -O2 -pipe -g -feliminate-unused-debug-types +-- +1.7.11.2 +
meta/recipes-support/icu/icu-3.6.inc +11 -0
@@ -7,6 +7,7 @@ BASE_SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c- file://fix-parallel-build.patch \ file://use-g++-for-linking.patch \ file://larger-cmd-size.patch \ + file://icu-add-pkgconfig-support.patch \ " SRC_URI = "${BASE_SRC_URI} \ file://noldlibpath.patch \
@@ -28,6 +29,12 @@ inherit autotools pkgconfig binconfig do_configure() { libtoolize --force gnu-configize --force + if [ "${PN}" != "icu-native" ]; then + OLD=`pwd` + cd ${S} + autoconf + cd ${OLD} + fi oe_runconf if [ "${PN}" != "icu-native" ]; then # In the non-native case we need to make substitutions to use
@@ -45,6 +52,10 @@ do_compile() { do_install_append() { chmod +x ${D}${libdir}/lib* + if [ "${PN}" != "icu-native" ]; then + install -d ${D}/${libdir}/pkgconfig + install -m 0644 ${S}/icu.pc ${D}/${libdir}/pkgconfig + fi } PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio"
meta/recipes-support/icu/icu_3.6.bb +1 -1
@@ -1,6 +1,6 @@ require icu-3.6.inc -PR = "r9" +PR = "r10" SRC_URI[md5sum] = "6243f7a19e03e05403ce84e597510d4c" SRC_URI[sha256sum] = "5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041"
Signature · 1 line
1.7.9.5
Re: [PATCH 2/4] icu: add pkgconfig support
Quoted 1 line · On 26 November 2012 09:36, <[email protected]> wrote:
+Upstream-Status: Inappropriate [distribution]
Surely this (and all others) should be submitted upstream.
Ross
PATCH 3/4 pth: add pkgconfig support
In reply to [email protected]From: Chen Qi <[email protected]>
Add pkgconfig support for pth
[YOCTO# 2453]
--- .../pth/files/pth-add-pkgconfig-support.patch | 44 ++++++++++++++++++++ meta/recipes-support/pth/pth_2.0.7.bb | 12 ++++-- 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch
meta/recipes-support/pth/files/pth-add-pkgconfig-support.patch new file +44 -0
@@ -0,0 +1,44 @@ +Upstream-Status: Inappropriate [distribution] + +Signed-off-by: Chen Qi <[email protected]> + +Index: configure.ac +========================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -656,6 +657,13 @@ pth_acmac.h dnl + chmod +rx pthread-config + chmod +rx pth-config + )dnl ++ ++PTH_VERSION=`echo $PTH_VERSION_STR | cut -d' ' -f1` ++AC_SUBST(PTH_VERSION) ++ ++AC_CONFIG_FILES([pth.pc]) ++AC_OUTPUT ++ + if test ".$enable_pthread" = .no; then + rm -f pthread-config + rm -f pthread.h + +Index: pth.pc.in +========================================================= +--- /dev/null ++++ b/pth.pc.in +@@ -0,0 +1,16 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++bindir=@bindir@ ++mandir=@mandir@ ++datadir=@datadir@ ++acdir=@datadir@/aclocal ++ ++Name: pth ++Description: GNU Portable Threads ++Requires: ++Version: @PTH_VERSION@ ++Libs: -L${libdir} -lpth ++Libs.private: ++Cflags: -I${includedir}
meta/recipes-support/pth/pth_2.0.7.bb +9 -3
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/pth/" SECTION = "libs" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;beginline=12;endline=15;md5=a48af114a80c222cafd37f24370a77b1" -PR = "r2" +PR = "r3" python __anonymous () { import re
@@ -13,16 +13,22 @@ python __anonymous () { } SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \ - " + file://pth-add-pkgconfig-support.patch" SRC_URI[md5sum] = "9cb4a25331a4c4db866a31cbe507c793" SRC_URI[sha256sum] = "72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232" PARALLEL_MAKE="" -inherit autotools binconfig +inherit autotools binconfig pkgconfig do_configure() { gnu-configize + autoconf oe_runconf } + +do_install_append() { + install -d ${D}/${libdir}/pkgconfig + install -m 0644 ${S}/pth.pc ${D}/${libdir}/pkgconfig/ +}
Signature · 1 line
1.7.9.5
PATCH 4/4 libassuan: add pkgconfig support
In reply to [email protected]From: Chen Qi <[email protected]>
Add pkgconfig support for libassuan
[YOCTO# 2453]
--- .../files/libassuan-add-pkgconfig-support.patch | 33 ++++++++++++++++++++ meta/recipes-support/libassuan/libassuan_2.0.3.bb | 10 ++++-- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch
meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch new file +33 -0
@@ -0,0 +1,33 @@ +Upstream-Status: Inappropriate [distribution] + +Signed-off-by: Chen Qi <[email protected]> + +Index: configure.ac +======================================================================= +--- a/configure.ac ++++ b/configure.ac +@@ -380,5 +380,5 @@ 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([src/assuan.pc]) + AC_OUTPUT + +Index: src/assuan.pc.in +======================================================================= +--- /dev/null ++++ b/src/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}
meta/recipes-support/libassuan/libassuan_2.0.3.bb +8 -2
@@ -10,9 +10,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ DEPENDS = "libgpg-error" -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2 \ + file://libassuan-add-pkgconfig-support.patch" SRC_URI[md5sum] = "179d1918325fdb928c7bd90b8a514fc7" SRC_URI[sha256sum] = "bad5682374c76bcc0abb1a7a34c9557af6874a477500748e64a7d3def79cac1b" -inherit autotools binconfig +inherit autotools binconfig pkgconfig + +do_install_append() { + install -d ${D}/${libdir}/pkgconfig + install -m 0644 ${S}/src/assuan.pc ${D}/${libdir}/pkgconfig/ +}
Signature · 1 line
1.7.9.5