From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Cc: Koen Kooi <koen@dominion.thruhere.net>
Subject: Re: [PATCH] zlib 1.2.5: install pkgconfig file, needed for e.g. modern webkit
Date: Wed, 30 Nov 2011 17:52:33 +0000 [thread overview]
Message-ID: <1322675553.17484.20.camel@ted> (raw)
In-Reply-To: <1322660459-333-1-git-send-email-koen@dominion.thruhere.net>
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"
next prev parent reply other threads:[~2011-11-30 17:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1322675553.17484.20.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=koen@dominion.thruhere.net \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox