summaryrefslogtreecommitdiffstats
path: root/meta
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
parent1a7509d673023da5d1db579450beb897129a30e8 (diff)
downloadpoky-14770205c1de2753f10cbb0d0703113aefb21a73.tar.gz
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')
-rw-r--r--meta/classes/staging.bbclass14
-rw-r--r--meta/classes/utils.bbclass15
2 files changed, 2 insertions, 27 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index a7f3258b4a..438cf375b9 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -26,20 +26,6 @@ sysroot_stage_libdir() {
26 dest="$2" 26 dest="$2"
27 27
28 sysroot_stage_dir $src $dest 28 sysroot_stage_dir $src $dest
29
30 olddir=`pwd`
31 cd $dest
32 las=$(find . -name \*.la -type f)
33 cd $olddir
34 echo "Found la files: $las"
35 for i in $las
36 do
37 sed -e 's/^installed=yes$/installed=no/' \
38 -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
39 -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
40 -e "/^dependency_libs=/s,\([[:space:]']\)${base_libdir},\1${STAGING_DIR_HOST}${base_libdir},g" \
41 -i $dest/$i
42 done
43} 29}
44 30
45sysroot_stage_dirs() { 31sysroot_stage_dirs() {
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 746f46ce52..4d4b9953e2 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -199,19 +199,8 @@ oe_libinstall() {
199 __runcmd install -m 0644 $dota $destpath/ 199 __runcmd install -m 0644 $dota $destpath/
200 fi 200 fi
201 if [ -f "$dotlai" -a -n "$libtool" ]; then 201 if [ -f "$dotlai" -a -n "$libtool" ]; then
202 if test -n "$staging_install" 202 rm -f $destpath/$libname.la
203 then 203 __runcmd install -m 0644 $dotlai $destpath/$libname.la
204 # stop libtool using the final directory name for libraries
205 # in staging:
206 __runcmd rm -f $destpath/$libname.la
207 __runcmd sed -e 's/^installed=yes$/installed=no/' \
208 -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
209 -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
210 $dotlai >$destpath/$libname.la
211 else
212 rm -f $destpath/$libname.la
213 __runcmd install -m 0644 $dotlai $destpath/$libname.la
214 fi
215 fi 204 fi
216 205
217 for name in $library_names; do 206 for name in $library_names; do