From 320be50c5018a4860a8cd083acaaf2c0d834a271 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 13 Nov 2007 17:17:37 +0000 Subject: 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 --- meta/classes/base.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta') 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 -- cgit 1.2.3-korg