[oe-commits] Khem Raj : autotools.bbclass: Conditionally use autotools_prepackage_lamangler

[git version control]

Module: openembedded.git
Branch: master
Commit: 014bd3b53453233d7b63c7ac46ba9afe443a7498
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=014bd3b53453233d7b63c7ac46ba9afe443a7498

Author: Khem Raj <raj.khem at gmail.com>
Date:   Tue Oct  5 16:50:27 2010 -0700

autotools.bbclass: Conditionally use autotools_prepackage_lamangler

* autotools_prepackage_lamangler is not needed with libtool 2.4+
* add --with-sysroot when using libtool 2.4+

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Acked-by: Martin Jansa <Martin.Jansa at gmail.com>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Acked-by: Koen Kooi <k-kooi at ti.com>

---

 classes/autotools.bbclass |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index b2de2b1..ce4f66a 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -79,7 +79,9 @@ CONFIGUREOPTS = " --build=${BUILD_SYS} \
 
 oe_runconf () {
 	if [ -x ${S}/configure ] ; then
-		${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"
+		${S}/configure \
+		${@["","--with-sysroot"][bb.data.getVar('LIBTOOL_HAS_SYSROOT', d, 1) == "yes"]} \
+		${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"
 	else
 		oefatal "no configure script found"
 	fi
@@ -170,8 +172,7 @@ autotools_do_install() {
 	oe_runmake 'DESTDIR=${D}' install
 }
 
-PACKAGE_PREPROCESS_FUNCS += "autotools_prepackage_lamangler"
-
+PACKAGE_PREPROCESS_FUNCS += "${@['autotools_prepackage_lamangler',''][bb.data.getVar('LIBTOOL_HAS_SYSROOT', d, 1) == "yes"]}"
 autotools_prepackage_lamangler () {
         for i in `find ${PKGD} -name "*.la"` ; do \
             sed -i -e 's:${STAGING_LIBDIR}:${libdir}:g;' \