From 002caab239157d1062a3f49b62efb06ef0489280 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 15 May 2007 12:52:57 +0000 Subject: libtool, autotools.bbclass: merge fixes for 1.5.10 from poky * NOTE: 1.5.22 has to be updated as well --- classes/autotools.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'classes/autotools.bbclass') diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 33546e0eb6..3c555751da 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -15,6 +15,10 @@ def autotools_dep_prepend(d): if not pn in ['libtool', 'libtool-native', 'libtool-cross']: deps += 'libtool-native ' + if not bb.data.inherits_class('native', d) \ + and not bb.data.inherits_class('cross', d) \ + and not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1): + deps += 'libtool-cross ' return deps + 'gnu-config-native ' -- cgit v1.2.3 From 905009f453a941085816827efbf12f048f18cd54 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 25 Jul 2007 12:35:19 +0000 Subject: autotools.bbclass: run sed over .la files to removes various occurences to staging, workdir and ${D} --- classes/autotools.bbclass | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'classes/autotools.bbclass') diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 3c555751da..fccf2b6d80 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -139,6 +139,13 @@ autotools_do_configure() { autotools_do_install() { oe_runmake 'DESTDIR=${D}' install + + for i in `find ${D} -name "*.la"` ; do \ + sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i + sed -i -e s:${D}::g $i + sed -i -e 's:-I${WORKDIR}\S*: :g' $i + sed -i -e 's:-L${WORKDIR}\S*: :g' $i + done } STAGE_TEMP="${WORKDIR}/temp-staging" -- cgit v1.2.3