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

[openwrt/openwrt.git] / toolchain / uClibc / Config.in

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index ae0bcde6226579ed269b3e0fb35c26289f309283..74c38fe2dd3e94586ae8e0148be1593264799aba 100644 (file)
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -1,31 +1,22 @@
 # Choose uclibc version.
 
 choice
-       prompt "uClibc Version" if TOOLCHAINOPTS
-       default UCLIBC_VERSION_0_9_28 if LINUX_2_4
+       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.
-         Default for kernel 2.6 is 0.9.29, for kernel 2.4 it is 0.9.28 .
-
-       config UCLIBC_VERSION_SNAPSHOT
-               bool "uClibc snapshot"
-
-       config UCLIBC_VERSION_0_9_28
-               bool "uClibc 0.9.28"
 
        config UCLIBC_VERSION_0_9_29
-               depends !LINUX_2_4
                bool "uClibc 0.9.29"
 
+       config UCLIBC_VERSION_0_9_30_1
+               bool "uClibc 0.9.30.1"
+
+       config UCLIBC_VERSION_NPTL
+               bool "uClibc NPTL branch"
+               depends BROKEN
+
 endchoice
 
-config UCLIBC_EXTRA_VERSION
-       string
-       prompt "Extra uClibc version" if TOOLCHAINOPTS
-       default "snapshot"   if UCLIBC_VERSION_SNAPSHOT
-       default ".2"         if UCLIBC_VERSION_0_9_28
-       default ""
-       help
-           Default for version 0.9.28 is ".02", for daily snapshot it's just "snapshot"
-           For all other versions the default string is empty.