* [PATCH] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit
@ 2011-11-30 13:40 Koen Kooi
2011-11-30 17:52 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Koen Kooi @ 2011-11-30 13:40 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>
---
| 1 -
meta/recipes-core/zlib/zlib_1.2.5.bb | 18 ++++++++++++++++--
2 files changed, 16 insertions(+), 3 deletions(-)
delete mode 100644 meta/recipes-core/zlib/site_config/headers
diff --git a/meta/recipes-core/zlib/site_config/headers b/meta/recipes-core/zlib/site_config/headers
deleted file mode 100644
index 5026891..0000000
--- a/meta/recipes-core/zlib/site_config/headers
+++ /dev/null
@@ -1 +0,0 @@
-zlib.h
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] 6+ messages in thread* Re: [PATCH] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit
2011-11-30 13:40 [PATCH] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit Koen Kooi
@ 2011-11-30 17:52 ` Richard Purdie
2011-11-30 18:15 ` Koen Kooi
0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2011-11-30 17:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
On Wed, 2011-11-30 at 14:40 +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
How did you determine this was unused?
Cheers,
Richard
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-core/zlib/site_config/headers | 1 -
> meta/recipes-core/zlib/zlib_1.2.5.bb | 18 ++++++++++++++++--
> 2 files changed, 16 insertions(+), 3 deletions(-)
> delete mode 100644 meta/recipes-core/zlib/site_config/headers
>
> diff --git a/meta/recipes-core/zlib/site_config/headers b/meta/recipes-core/zlib/site_config/headers
> deleted file mode 100644
> index 5026891..0000000
> --- a/meta/recipes-core/zlib/site_config/headers
> +++ /dev/null
> @@ -1 +0,0 @@
> -zlib.h
> 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"
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit
2011-11-30 17:52 ` Richard Purdie
@ 2011-11-30 18:15 ` Koen Kooi
2011-12-01 13:01 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Koen Kooi @ 2011-11-30 18:15 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2632 bytes --]
Op 30 nov. 2011, om 18:52 heeft Richard Purdie het volgende geschreven:
> On Wed, 2011-11-30 at 14:40 +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
>
> How did you determine this was unused?
By removing it and rebuilding zlib(-native) and zlib dependant apps. In case it does turn out to be needed we should switch to cmake. I'm OK with having a OE hack for autotools, but a broken OE hack....
regards,
Koen
>
> Cheers,
>
> Richard
>
>>
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> meta/recipes-core/zlib/site_config/headers | 1 -
>> meta/recipes-core/zlib/zlib_1.2.5.bb | 18 ++++++++++++++++--
>> 2 files changed, 16 insertions(+), 3 deletions(-)
>> delete mode 100644 meta/recipes-core/zlib/site_config/headers
>>
>> diff --git a/meta/recipes-core/zlib/site_config/headers b/meta/recipes-core/zlib/site_config/headers
>> deleted file mode 100644
>> index 5026891..0000000
>> --- a/meta/recipes-core/zlib/site_config/headers
>> +++ /dev/null
>> @@ -1 +0,0 @@
>> -zlib.h
>> 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"
>
>
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit
2011-11-30 18:15 ` Koen Kooi
@ 2011-12-01 13:01 ` Richard Purdie
2011-12-01 14:58 ` Koen Kooi
0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2011-12-01 13:01 UTC (permalink / raw)
To: Koen Kooi; +Cc: Patches and discussions about the oe-core layer
On Wed, 2011-11-30 at 19:15 +0100, Koen Kooi wrote:
> Op 30 nov. 2011, om 18:52 heeft Richard Purdie het volgende geschreven:
>
> > On Wed, 2011-11-30 at 14:40 +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
> >
> > How did you determine this was unused?
>
> By removing it and rebuilding zlib(-native) and zlib dependant apps.
> In case it does turn out to be needed we should switch to cmake. I'm
> OK with having a OE hack for autotools, but a broken OE hack....
I don't think you understand what that site_config file triggers. It
triggers code in siteconfig.bbclass which saves the *results* of the
zlib configure for use in speeding up subsequent configure tasks.
Does that change the need to remove it?
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit
2011-12-01 13:01 ` Richard Purdie
@ 2011-12-01 14:58 ` Koen Kooi
2011-12-01 15:45 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Koen Kooi @ 2011-12-01 14:58 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]
Op 1 dec. 2011, om 14:01 heeft Richard Purdie het volgende geschreven:
> On Wed, 2011-11-30 at 19:15 +0100, Koen Kooi wrote:
>> Op 30 nov. 2011, om 18:52 heeft Richard Purdie het volgende geschreven:
>>
>>> On Wed, 2011-11-30 at 14:40 +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
>>>
>>> How did you determine this was unused?
>>
>> By removing it and rebuilding zlib(-native) and zlib dependant apps.
>> In case it does turn out to be needed we should switch to cmake. I'm
>> OK with having a OE hack for autotools, but a broken OE hack....
>
> I don't think you understand what that site_config file triggers. It
> triggers code in siteconfig.bbclass which saves the *results* of the
> zlib configure for use in speeding up subsequent configure tasks.
>
> Does that change the need to remove it?
I honestly don't know, I've never dealt with that part of siteconfig. If the file is needed I'll gladly respin the patch.
regards,
Koen
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit
2011-12-01 14:58 ` Koen Kooi
@ 2011-12-01 15:45 ` Richard Purdie
0 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2011-12-01 15:45 UTC (permalink / raw)
To: Koen Kooi; +Cc: Patches and discussions about the oe-core layer
On Thu, 2011-12-01 at 15:58 +0100, Koen Kooi wrote:
> Op 1 dec. 2011, om 14:01 heeft Richard Purdie het volgende geschreven:
>
> > On Wed, 2011-11-30 at 19:15 +0100, Koen Kooi wrote:
> >> Op 30 nov. 2011, om 18:52 heeft Richard Purdie het volgende geschreven:
> >>
> >>> On Wed, 2011-11-30 at 14:40 +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
> >>>
> >>> How did you determine this was unused?
> >>
> >> By removing it and rebuilding zlib(-native) and zlib dependant apps.
> >> In case it does turn out to be needed we should switch to cmake. I'm
> >> OK with having a OE hack for autotools, but a broken OE hack....
> >
> > I don't think you understand what that site_config file triggers. It
> > triggers code in siteconfig.bbclass which saves the *results* of the
> > zlib configure for use in speeding up subsequent configure tasks.
> >
> > Does that change the need to remove it?
>
> I honestly don't know, I've never dealt with that part of siteconfig.
> If the file is needed I'll gladly respin the patch.
That file does make sense so please do :)
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-12-01 15:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-30 13:40 [PATCH] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit Koen Kooi
2011-11-30 17:52 ` Richard Purdie
2011-11-30 18:15 ` Koen Kooi
2011-12-01 13:01 ` Richard Purdie
2011-12-01 14:58 ` Koen Kooi
2011-12-01 15:45 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox