summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2010-12-21 14:17:58 -0800
committerSaul Wold <sgw@linux.intel.com>2011-01-21 01:36:15 -0800
commit1a7509d673023da5d1db579450beb897129a30e8 (patch)
tree8650f296869fe3f235e9d43d5c3288bfbf6840bb
parentded899b5804c7ceb108e9476d1164f7da0adfb34 (diff)
downloadopenembedded-core-1a7509d673023da5d1db579450beb897129a30e8.tar.gz
openembedded-core-1a7509d673023da5d1db579450beb897129a30e8.tar.bz2
openembedded-core-1a7509d673023da5d1db579450beb897129a30e8.tar.xz
openembedded-core-1a7509d673023da5d1db579450beb897129a30e8.zip
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>
-rw-r--r--meta/classes/autotools.bbclass25
1 files changed, 9 insertions, 16 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 324cbff47..39f5036ec 100644
--- 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
}