[oe-commits] Khem Raj : bitbake.conf: Define LIBTOOL_HAS_SYSROOT

[git version control]

Module: openembedded.git
Branch: master
Commit: 77eaf6d5d3707742e18c2f07d6ef85aeed83feeb
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=77eaf6d5d3707742e18c2f07d6ef85aeed83feeb

Author: Khem Raj <raj.khem at gmail.com>
Date:   Tue Oct  5 14:45:46 2010 -0700

bitbake.conf: Define LIBTOOL_HAS_SYSROOT

* Set default weak to "no"
* Use in TARGET_LDFLAGS

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Acked-by: Martin Jansa <Martin.Jansa at gmail.com>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Acked-by: Koen Kooi <k-kooi at ti.com>

---

 conf/bitbake.conf |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 4e80d97..7f01f8f 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -414,6 +414,13 @@ EXTRA_IMAGEDEPENDS = ""
 ##################################################################
 # Toolchain info.
 ##################################################################
+
+# This variable is needed to set to 'yes' in conjuction with 
+# PREFERRED_VERSION for libtool when choosing libtool >= 2.4
+# by default this is unset and should be so for libtools < 2.4
+
+LIBTOOL_HAS_SYSROOT ?= "no"
+
 PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
 export PATH
 
@@ -484,10 +491,8 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
                         -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
 
 export LDFLAGS = "${TARGET_LDFLAGS}"
-export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \
-                         -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} \
-                         -Wl,-O1 \
-                         ${TARGET_LINK_HASH_STYLE}"
+export TARGET_LDFLAGS = '${@["-L${STAGING_DIR_TARGET}${libdir} -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} -Wl,-O1 ${TARGET_LINK_HASH_STYLE}", "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"][bb.data.getVar('LIBTOOL_HAS_SYSROOT', d, 1) == "yes"]}'
+
 export SDK_LDFLAGS = "-L${STAGING_DIR_SDK}${libdir} \
                          -Wl,-rpath-link,${STAGING_DIR_SDK}${libdir} \
                          -Wl,-O1"