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>
This commit is contained in:
parent
1a7509d673
commit
14770205c1
|
@ -26,20 +26,6 @@ sysroot_stage_libdir() {
|
|||
dest="$2"
|
||||
|
||||
sysroot_stage_dir $src $dest
|
||||
|
||||
olddir=`pwd`
|
||||
cd $dest
|
||||
las=$(find . -name \*.la -type f)
|
||||
cd $olddir
|
||||
echo "Found la files: $las"
|
||||
for i in $las
|
||||
do
|
||||
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" \
|
||||
-e "/^dependency_libs=/s,\([[:space:]']\)${base_libdir},\1${STAGING_DIR_HOST}${base_libdir},g" \
|
||||
-i $dest/$i
|
||||
done
|
||||
}
|
||||
|
||||
sysroot_stage_dirs() {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue