diff options
| author | Scott Garman <scott.a.garman@intel.com> | 2011-01-18 19:58:02 -0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-01-21 01:36:15 -0800 |
| commit | 14770205c1de2753f10cbb0d0703113aefb21a73 (patch) | |
| tree | 460f2083f1ca94d7c788ee05082bfaa42f91d829 | |
| parent | 1a7509d673023da5d1db579450beb897129a30e8 (diff) | |
| download | openembedded-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>
| -rw-r--r-- | meta/classes/staging.bbclass | 14 | ||||
| -rw-r--r-- | meta/classes/utils.bbclass | 15 |
2 files changed, 2 insertions, 27 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index a7f3258b4..438cf375b 100644 --- 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 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 |