* [PATCH v2] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit
@ 2011-12-01 15:48 Koen Kooi
2011-12-01 16:01 ` Martin Jansa
0 siblings, 1 reply; 3+ messages in thread
From: Koen Kooi @ 2011-12-01 15:48 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit
2011-12-01 15:48 [PATCH v2] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit Koen Kooi
@ 2011-12-01 16:01 ` Martin Jansa
2011-12-01 16:04 ` Koen Kooi
0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2011-12-01 16:01 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
[-- Attachment #1: Type: text/plain, Size: 2137 bytes --]
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
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit
2011-12-01 16:01 ` Martin Jansa
@ 2011-12-01 16:04 ` Koen Kooi
0 siblings, 0 replies; 3+ messages in thread
From: Koen Kooi @ 2011-12-01 16:04 UTC (permalink / raw)
To: Martin Jansa; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2289 bytes --]
/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
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-01 16:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-01 15:48 [PATCH v2] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit Koen Kooi
2011-12-01 16:01 ` Martin Jansa
2011-12-01 16:04 ` Koen Kooi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox