diff options
| author |   Koen Kooi <koen@openembedded.org> | 2005-11-27 16:11:50 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-11-27 16:11:50 +0000 |
| commit | 002edb6c7e429b3960687adc446c5598b710e330 (patch) | |
| tree | 50006c2c8c28a23ede111fd1af57c9df9f67aecd /classes | |
| parent | dec947d30671057549873be48cfb8292ec34eadb (diff) | |
| download | openembedded-002edb6c7e429b3960687adc446c5598b710e330.tar.gz | |
base.bbclass: merge improvements from .dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 18d51a02ed..c5359b20f8 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -124,6 +124,7 @@ oe_libinstall() { silent="" require_static="" require_shared="" + staging_install="" while [ "$#" -gt 0 ]; do case "$1" in -C) @@ -155,6 +156,10 @@ oe_libinstall() { if [ -z "$destpath" ]; then oefatal "oe_libinstall: no destination path specified" fi + if echo "$destpath/" | egrep '^${STAGING_LIBDIR}/' >/dev/null + then + staging_install=1 + fi __runcmd () { if [ -z "$silent" ]; then @@ -188,7 +193,15 @@ oe_libinstall() { fi dotlai=$libname.lai if [ -f "$dotlai" -a -n "$libtool" ]; then - __runcmd install -m 0644 $dotlai $destpath/$libname.la + 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 + else + __runcmd install -m 0644 $dotlai $destpath/$libname.la + fi fi for name in $library_names; do |