summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2005-07-21 21:22:30 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-21 21:22:30 +0000
commitad7106e337630ec79c8790b548661c01e229576d (patch)
tree5efea0f03d3a4accdbafabb0488bf0b9293d3277 /classes
parent04cc8baaa88236f7c642f6ab2f0e9ee39e255b28 (diff)
classes/base.bbclass:
Change oe_libinstall (watch carefully): If the user requires the installation of a static library and it does not exist we want the user to notice and fail. I assume this was then intended purpose for the requirestatic variable. The matter for the dotlai (.lai) is a bit different. The system automatically detects the .la file and assumes it is libtool generated and wants to install the .lai file even if it does not exist. I think this is wrong and I change it to do the following: If it decides it has libtool it installs the .lai if it is present. (change the -o to -a) At least Qt Version 3 has a .la but no .lai in its library directory and oe_libinstall fails to install.
Diffstat (limited to 'classes')
-rw-r--r--classes/base.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 1da58a924e..37254b94ba 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -187,7 +187,7 @@ oe_libinstall() {
__runcmd install -m 0644 $dota $destpath/
fi
dotlai=$libname.lai
- if [ -f "$dotlai" -o -n "$libtool" ]; then
+ if [ -f "$dotlai" -a -n "$libtool" ]; then
__runcmd install -m 0644 $dotlai $destpath/$libname.la
fi