From 8459e9dabe3263d4dbd05c4c58b60b1a65e6c84d Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sat, 20 May 2006 15:12:18 +0200 Subject: [PATCH] base.bbclass: pull in oe_libinstall() from org.openembedded.dev as of revision c6e99d370aaf506d4e330f5a4e5a31b3271adc8e Signed-off-by: Rene Wagner --- org.handhelds.familiar/classes/base.bbclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/org.handhelds.familiar/classes/base.bbclass b/org.handhelds.familiar/classes/base.bbclass index c5359b2..1ff7298 100644 --- a/org.handhelds.familiar/classes/base.bbclass +++ b/org.handhelds.familiar/classes/base.bbclass @@ -171,9 +171,8 @@ oe_libinstall() { if [ -z "$dir" ]; then dir=`pwd` fi - if [ -d "$dir/.libs" ]; then - dir=$dir/.libs - fi + dotlai=$libname.lai + dir=$dir`(cd $dir; find -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"` olddir=`pwd` __runcmd cd $dir @@ -191,14 +190,13 @@ oe_libinstall() { if [ -f "$dota" -o -n "$require_static" ]; then __runcmd install -m 0644 $dota $destpath/ fi - dotlai=$libname.lai 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/' $dotlai >$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 else __runcmd install -m 0644 $dotlai $destpath/$libname.la fi -- 2.41.0