summaryrefslogtreecommitdiff
path: root/meta/classes/utils.bbclass
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-01-18 19:58:02 -0800
committerSaul Wold <sgw@linux.intel.com>2011-01-21 01:36:15 -0800
commit14770205c1de2753f10cbb0d0703113aefb21a73 (patch)
tree460f2083f1ca94d7c788ee05082bfaa42f91d829 /meta/classes/utils.bbclass
parent1a7509d673023da5d1db579450beb897129a30e8 (diff)
downloadopenembedded-core-14770205c1de2753f10cbb0d0703113aefb21a73.tar.gz
openembedded-core-14770205c1de2753f10cbb0d0703113aefb21a73.tar.bz2
openembedded-core-14770205c1de2753f10cbb0d0703113aefb21a73.tar.xz
openembedded-core-14770205c1de2753f10cbb0d0703113aefb21a73.zip
staging.bbclass, utils.bbclass: remove la mangling code
libtool v2.4 --with-libtool-sysroot eliminates the need for la mangling. Based on Khem Raj's OE commits. Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/classes/utils.bbclass')
-rw-r--r--meta/classes/utils.bbclass15
1 files changed, 2 insertions, 13 deletions
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 746f46ce5..4d4b9953e 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -199,19 +199,8 @@ oe_libinstall() {
__runcmd install -m 0644 $dota $destpath/
fi
if [ -f "$dotlai" -a -n "$libtool" ]; then
- if test -n "$staging_install"
- then
- # stop libtool using the final directory name for libraries
- # in staging:
- __runcmd rm -f $destpath/$libname.la
- __runcmd sed -e 's/^installed=yes$/installed=no/' \
- -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
- -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
- $dotlai >$destpath/$libname.la
- else
- rm -f $destpath/$libname.la
- __runcmd install -m 0644 $dotlai $destpath/$libname.la
- fi
+ rm -f $destpath/$libname.la
+ __runcmd install -m 0644 $dotlai $destpath/$libname.la
fi
for name in $library_names; do