diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2010-10-05 16:50:27 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-10-10 00:03:56 -0700 |
| commit | 014bd3b53453233d7b63c7ac46ba9afe443a7498 (patch) | |
| tree | 8ac0fe4d5de2ffb124711e9f9f0944680fdd4c29 /classes | |
| parent | 77eaf6d5d3707742e18c2f07d6ef85aeed83feeb (diff) | |
| download | openembedded-014bd3b53453233d7b63c7ac46ba9afe443a7498.tar.gz | |
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@gmail.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Acked-by: Koen Kooi <k-kooi@ti.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index b2de2b13f7..ce4f66a498 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;' \ |