diff options
author | Richard Purdie <richard@openedhand.com> | 2005-12-12 14:41:23 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-12-12 14:41:23 +0000 |
commit | f0702a22fe1e95075d0159ddeafb453ab4c87ebc (patch) | |
tree | d2eed3877e77b9fc71c6a05ba652f2f406b28465 /openembedded/classes/base.bbclass | |
parent | 9e7c699670036999a2c4c238d910534689739aa3 (diff) | |
download | poky-f0702a22fe1e95075d0159ddeafb453ab4c87ebc.tar.gz |
oe/classes updates from Openembedded
git-svn-id: https://svn.o-hand.com/repos/poky@187 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/classes/base.bbclass')
-rw-r--r-- | openembedded/classes/base.bbclass | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/openembedded/classes/base.bbclass b/openembedded/classes/base.bbclass index 18d51a02ed..c5359b20f8 100644 --- a/openembedded/classes/base.bbclass +++ b/openembedded/classes/base.bbclass | |||
@@ -124,6 +124,7 @@ oe_libinstall() { | |||
124 | silent="" | 124 | silent="" |
125 | require_static="" | 125 | require_static="" |
126 | require_shared="" | 126 | require_shared="" |
127 | staging_install="" | ||
127 | while [ "$#" -gt 0 ]; do | 128 | while [ "$#" -gt 0 ]; do |
128 | case "$1" in | 129 | case "$1" in |
129 | -C) | 130 | -C) |
@@ -155,6 +156,10 @@ oe_libinstall() { | |||
155 | if [ -z "$destpath" ]; then | 156 | if [ -z "$destpath" ]; then |
156 | oefatal "oe_libinstall: no destination path specified" | 157 | oefatal "oe_libinstall: no destination path specified" |
157 | fi | 158 | fi |
159 | if echo "$destpath/" | egrep '^${STAGING_LIBDIR}/' >/dev/null | ||
160 | then | ||
161 | staging_install=1 | ||
162 | fi | ||
158 | 163 | ||
159 | __runcmd () { | 164 | __runcmd () { |
160 | if [ -z "$silent" ]; then | 165 | if [ -z "$silent" ]; then |
@@ -188,7 +193,15 @@ oe_libinstall() { | |||
188 | fi | 193 | fi |
189 | dotlai=$libname.lai | 194 | dotlai=$libname.lai |
190 | if [ -f "$dotlai" -a -n "$libtool" ]; then | 195 | if [ -f "$dotlai" -a -n "$libtool" ]; then |
191 | __runcmd install -m 0644 $dotlai $destpath/$libname.la | 196 | if test -n "$staging_install" |
197 | then | ||
198 | # stop libtool using the final directory name for libraries | ||
199 | # in staging: | ||
200 | __runcmd rm -f $destpath/$libname.la | ||
201 | __runcmd sed -e 's/^installed=yes$/installed=no/' $dotlai >$destpath/$libname.la | ||
202 | else | ||
203 | __runcmd install -m 0644 $dotlai $destpath/$libname.la | ||
204 | fi | ||
192 | fi | 205 | fi |
193 | 206 | ||
194 | for name in $library_names; do | 207 | for name in $library_names; do |