From 5a90bc8ba10650f5f92dabfcc4ac7d91bfd0aaa6 Mon Sep 17 00:00:00 2001
From: woglinde <heinold@inf.fu-berlin.de>
Date: Fri, 3 Apr 2009 23:18:11 +0200
Subject: e2fsprogs: disable tls for now, if we are oabi and uclibc * make
 comment for uclibc nptl

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

(limited to 'recipes/e2fsprogs')

diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc
index eb094470c4..b7a1223cc9 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 = ""
-- 
cgit v1.2.3