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 <[email protected]> >> --- >> 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" > >
signature.asc
Description: Message signed with OpenPGP using GPGMail
_______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
