autotools.bbclass: libtool sysroot support changes

We do not do it for native recipes, as the native compiler should
fall back to a prefix of /usr and not solely depend on the sysroot.
Otherwise we end up staging everything in the native sysroot before
we start to build target recipes.

Also remove la mangling code, which is no longer necessary.

Commit derived from Khem Raj's OE commits.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 324cbff47acf6a61c0de6e6cc0f24aa8790f8469..39f5036ecfad19e5575bafe856c138f219fb624b 100644 (file)
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -38,6 +38,12 @@ def autotools_set_crosscompiling(d):
                return " cross_compiling=yes"
        return ""
 
+def append_libtool_sysroot(d):
+       # Only supply libtool sysroot option for non-native packages
+       if not bb.data.inherits_class('native', d):
+               return '--with-libtool-sysroot=${STAGING_DIR_HOST}'
+       return ""
+
 # EXTRA_OECONF_append = "${@autotools_set_crosscompiling(d)}"
 
 CONFIGUREOPTS = " --build=${BUILD_SYS} \
@@ -56,14 +62,13 @@ CONFIGUREOPTS = " --build=${BUILD_SYS} \
                  --includedir=${includedir} \
                  --oldincludedir=${oldincludedir} \
                  --infodir=${infodir} \
-                 --mandir=${mandir}"
+                 --mandir=${mandir} \
+                 ${@append_libtool_sysroot(d)}"
 
 oe_runconf () {
        if [ -x ${S}/configure ] ; then
                cfgcmd="${S}/configure \
-                       ${CONFIGUREOPTS} \
-                       ${EXTRA_OECONF} \
-                   $@"
+               ${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
                oenote "Running $cfgcmd..."
                $cfgcmd || oefatal "oe_runconf failed" 
        else
@@ -152,18 +157,6 @@ autotools_do_install() {
        oe_runmake 'DESTDIR=${D}' install
 }
 
-PACKAGE_PREPROCESS_FUNCS += "autotools_prepackage_lamangler"
-
-autotools_prepackage_lamangler () {
-        for i in `find ${PKGD} -name "*.la"` ; do \
-            sed -i -e 's:${STAGING_LIBDIR}:${libdir}:g;' \
-                   -e 's:${D}::g;' \
-                   -e 's:-I${WORKDIR}\S*: :g;' \
-                   -e 's:-L${WORKDIR}\S*: :g;' \
-                   $i
-       done
-}
-
 autotools_stage_dir() {
        sysroot_stage_dir $1 $2
 }