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>

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index a7f3258b4a62a4b263f3543f6bb9bd8f2275035b..438cf375b93631a0978d018a1e9e5066672f74cf 100644 (file)
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -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() {

diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 746f46ce521a7470d67336a1f47a7eed23853321..4d4b9953e23607fb1d3df723bb6be89fa8c67a9a 100644 (file)
--- 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