From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 27 Apr 2009 15:52:01 +0000 (+0000)
Subject: building uml on x86_64 w/ uClibc 0.9.29 is currently broken, select 0.9.30.1 which... 
X-Git-Tag: reboot~23830
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=9f627dbf6e018c2c61ea3254b4ab9d80ae70c213;hp=b558d4b839b76f99282b98ef5542caf5ea0dce6a

building uml on x86_64 w/ uClibc 0.9.29 is currently broken, select 0.9.30.1 which is working

SVN-Revision: 15450
---

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index e57543384b..74c38fe2dd 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -4,6 +4,7 @@ choice
 	prompt "uClibc Version"
 	depends on TOOLCHAINOPTS && USE_UCLIBC
 	default UCLIBC_VERSION_0_9_29
+	default UCLIBC_VERSION_0_9_30_1 if (TARGET_uml && x86_64)
 	help
 	  Select the version of uClibc you wish to use.
 
diff --git a/toolchain/uClibc/Config.version b/toolchain/uClibc/Config.version
index bc4ecca78e..96f13d9f25 100644
--- a/toolchain/uClibc/Config.version
+++ b/toolchain/uClibc/Config.version
@@ -2,7 +2,7 @@ config UCLIBC_VERSION
 	string
 	depends on USE_UCLIBC
 	default "0.9.29"       if UCLIBC_VERSION_0_9_29
-	default "0.9.30.1"     if UCLIBC_VERSION_0_9_30_1
+	default "0.9.30.1"     if UCLIBC_VERSION_0_9_30_1 || (TARGET_uml && x86_64)
 	default "0.9.30+nptl"  if UCLIBC_VERSION_NPTL
 	default "0.9.29"