[oe-commits] woglinde : e2fsprogs: disable tls for now, if we are oabi and uclibc

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 5a90bc8ba10650f5f92dabfcc4ac7d91bfd0aaa6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5a90bc8ba10650f5f92dabfcc4ac7d91bfd0aaa6

Author: woglinde <heinold at inf.fu-berlin.de>
Date:   Fri Apr  3 23:18:11 2009 +0200

e2fsprogs: disable tls for now, if we are oabi and uclibc
* make comment for uclibc nptl

---

 recipes/e2fsprogs/e2fsprogs.inc |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc
index eb09447..b7a1223 100644
--- a/recipes/e2fsprogs/e2fsprogs.inc
+++ b/recipes/e2fsprogs/e2fsprogs.inc
@@ -9,6 +9,9 @@ S = "${WORKDIR}/e2fsprogs-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF = "--enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}"
+#if uclibc ntpl is merged into trunk we can enable tls for armv4 again
+EXTRA_OECONF = "${@['','--disable-tls'][bb.data.getVar('ARM_ABI', d, 1) == 'oabi' and \
+		bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 ]} \
+		--enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}"
 
 PARALLEL_MAKE = ""