diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-11-13 17:17:37 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-11-13 17:17:37 +0000 |
| commit | 320be50c5018a4860a8cd083acaaf2c0d834a271 (patch) | |
| tree | 7108c03523d8d2a0e543294b712f8e016e043bbb /meta/classes | |
| parent | 206d6322489549bf4fce725ca85b3e4844facd58 (diff) | |
| download | openembedded-core-320be50c5018a4860a8cd083acaaf2c0d834a271.tar.gz openembedded-core-320be50c5018a4860a8cd083acaaf2c0d834a271.tar.bz2 openembedded-core-320be50c5018a4860a8cd083acaaf2c0d834a271.zip | |
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
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/base.bbclass | 5 |
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() { # 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' $dotlai >$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 __runcmd install -m 0644 $dotlai $destpath/$libname.la fi |