Patchwork [v3] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit

login
register
mail settings
Submitter Koen Kooi
Date Dec. 1, 2011, 4:04 p.m.
Message ID <1322755489-25533-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/15983/
State New
Headers show

Comments

Koen Kooi - Dec. 1, 2011, 4:04 p.m.
Upstream has grown cmake support which would allow us to dump the OE autotools hack, but the cmakefile doesn't install the .pc file either and breaks with zlib-native

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-core/zlib/zlib_1.2.5.bb |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)
Richard Purdie - Dec. 1, 2011, 5:30 p.m.
On Thu, 2011-12-01 at 17:04 +0100, Koen Kooi wrote:
> Upstream has grown cmake support which would allow us to dump the OE
> autotools hack, but the cmakefile doesn't install the .pc file either
> and breaks with zlib-native
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/recipes-core/zlib/zlib_1.2.5.bb |   18 ++++++++++++++++--
>  1 files changed, 16 insertions(+), 2 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-core/zlib/zlib_1.2.5.bb b/meta/recipes-core/zlib/zlib_1.2.5.bb
index bca400c..b5756d9 100644
--- a/meta/recipes-core/zlib/zlib_1.2.5.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.5.bb
@@ -7,12 +7,12 @@  LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d"
 
 DEPENDS = "libtool-cross"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
            file://configure.ac \
            file://Makefile.am \
-	   file://fix.inverted.LFS.logic.patch"
+           file://fix.inverted.LFS.logic.patch"
 
 SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
 SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
@@ -24,4 +24,18 @@  do_configure_prepend () {
 	cp ${WORKDIR}/Makefile.am ${S}/
 }
 
+do_install_append () {
+	sed \
+		-e 's:@prefix@:${prefix}:' \
+		-e 's:@exec_prefix@:${exec_prefix}:' \
+		-e 's:@libdir@:${libdir}:' \
+		-e 's:@sharedlibdir@:${libdir}:' \
+		-e 's:@includedir@:${includedir}:' \
+		-e 's:@VERSION@:${PV}:' \
+		zlib.pc.in > zlib.pc
+
+	install -d ${D}${libdir}/pkgconfig
+	install -m 0644 zlib.pc ${D}${libdir}/pkgconfig/
+}
+
 BBCLASSEXTEND = "native nativesdk"