From 266fa65afb20bf93b813d96421dce537a4dd2742 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard
Date: Mon, 5 Apr 2010 10:47:54 +0200
Subject: toolchain: add uClibc 0.9.31, mark 0.9.30.x as recent

Enable susv3/susv4 legacy support for now, as a lot of packages (E.G.
busybox) breaks with the stricter interpretation in 0.9.31.
Also slightly tweak uclibc.mk as the "new" linuxthreads symbol changed.

Test built on x86/x86-64/ppc/arm/mips.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 toolchain/uClibc/uclibc.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'toolchain/uClibc/uclibc.mk')

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index db346f0b7..52a8ae907 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -302,8 +302,10 @@ else
 endif
 ifeq ($(BR2_PTHREADS),y)
 	echo "LINUXTHREADS=y" >> $(UCLIBC_DIR)/.oldconfig
+	echo "LINUXTHREADS_NEW=y" >> $(UCLIBC_DIR)/.oldconfig
 else
 	echo "# LINUXTHREADS is not set" >> $(UCLIBC_DIR)/.oldconfig
+	echo "# LINUXTHREADS_NEW is not set" >> $(UCLIBC_DIR)/.oldconfig
 endif
 ifeq ($(BR2_PTHREADS_OLD),y)
 	echo "LINUXTHREADS_OLD=y" >> $(UCLIBC_DIR)/.oldconfig
@@ -410,7 +412,7 @@ $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.oldconfig
 	touch $@
 
 $(UCLIBC_DIR)/.configured: $(LINUX_HEADERS_DIR)/.configured $(UCLIBC_DIR)/.config
-	set -x && $(MAKE1) -C $(UCLIBC_DIR) \
+	$(MAKE1) -C $(UCLIBC_DIR) \
 		ARCH="$(UCLIBC_TARGET_ARCH)" \
 		PREFIX=$(TOOLCHAIN_DIR)/uClibc_dev/ \
 		DEVEL_PREFIX=/usr/ \
-- 
cgit v1.2.3-55-g7522