diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-11-28 20:31:23 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-11-28 20:31:23 +0000 |
| commit | 24715af7cd33bf4e50bc1fa0c50348938bacc928 (patch) | |
| tree | a57973e388e8f17f105d843e9d4d0bd25eccbeb6 /classes/base.bbclass | |
| parent | 0dd6ab7a56866cbedbcba43115530ff9e42b86e5 (diff) | |
| parent | 4e7ade7c5ebbdca9c9c57a2dcda1fba71944897d (diff) | |
merge of 44ef2a80f1407b2958e8f750892482362d9bb352
and d6ed8bd922639d616c17c01d270e9edf2bc6b517
Diffstat (limited to 'classes/base.bbclass')
| -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 |