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

login
register
mail settings
Submitter Koen Kooi
Date Dec. 1, 2011, 3:48 p.m.
Message ID <1322754516-32720-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/15981/
State Accepted
Commit e1312eef88cb0f3f1557d431f0b31520b2a9968e
Headers show

Comments

Koen Kooi - Dec. 1, 2011, 3:48 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

Also remove unused site config file

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(-)
Martin Jansa - Dec. 1, 2011, 4:01 p.m.
On Thu, Dec 01, 2011 at 04:48:36PM +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
> 
> Also remove unused site config file

^^ this is not true anymore..

> 
> 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(-)
> 
> 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"
> -- 
> 1.7.2.5
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Koen Kooi - Dec. 1, 2011, 4:04 p.m.
/me puts on dunce cap

Op 1 dec. 2011, om 17:01 heeft Martin Jansa het volgende geschreven:

> On Thu, Dec 01, 2011 at 04:48:36PM +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
>> 
>> Also remove unused site config file
> 
> ^^ this is not true anymore..
> 
>> 
>> 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(-)
>> 
>> 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"
>> -- 
>> 1.7.2.5
>> 
>> 
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

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"