summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-13 17:17:37 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-13 17:17:37 +0000
commit320be50c5018a4860a8cd083acaaf2c0d834a271 (patch)
tree7108c03523d8d2a0e543294b712f8e016e043bbb
parent206d6322489549bf4fce725ca85b3e4844facd58 (diff)
downloadpoky-320be50c5018a4860a8cd083acaaf2c0d834a271.tar.gz
base.bbclass: Improve .la file conversion from installed=yes to installed=no
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3140 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/classes/base.bbclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 06a49814d2..8f46d3e2b9 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -315,7 +315,10 @@ oe_libinstall() {
315 # stop libtool using the final directory name for libraries 315 # stop libtool using the final directory name for libraries
316 # in staging: 316 # in staging:
317 __runcmd rm -f $destpath/$libname.la 317 __runcmd rm -f $destpath/$libname.la
318 __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la 318 __runcmd sed -e 's/^installed=yes$/installed=no/' \
319 -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
320 -e "/^dependency_libs=/s,\([[:space:]']*\)${libdir},\1${STAGING_LIBDIR},g" \
321 $dotlai >$destpath/$libname.la
319 else 322 else
320 __runcmd install -m 0644 $dotlai $destpath/$libname.la 323 __runcmd install -m 0644 $dotlai $destpath/$libname.la
321 fi 324 fi