add a modified version of the mips64 patch from #4603

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

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 6c89fd25e532b5a94826494028cf58d9307bf171..523120a454dff74860864c782b0ac5fbcb15ffd0 100644 (file)
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -1,28 +1,42 @@
 # Choose uclibc version.
 
 choice
-       prompt "uClibc Version" if TOOLCHAINOPTS
+       prompt "uClibc Version"
+       depends on TOOLCHAINOPTS && USE_UCLIBC
        default UCLIBC_VERSION_0_9_29
        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
+               depends BROKEN
                bool "uClibc snapshot"
 
        config UCLIBC_VERSION_0_9_28
                bool "uClibc 0.9.28"
+               depends !(mips64 || mips64el)
 
        config UCLIBC_VERSION_0_9_29
                bool "uClibc 0.9.29"
 
+       config UCLIBC_VERSION_0_9_30
+               bool "uClibc 0.9.30"
+
 endchoice
 
+config UCLIBC_VERSION_NPTL
+       bool "Use NPTL branch"
+       depends on TOOLCHAINOPTS && USE_UCLIBC
+       depends on UCLIBC_VERSION_0_9_30
+       depends BROKEN
+
+
 config UCLIBC_EXTRA_VERSION
        string
-       prompt "Extra uClibc version" if TOOLCHAINOPTS
+       prompt "Extra uClibc version"
+       depends on TOOLCHAINOPTS && USE_UCLIBC
        default "snapshot"   if UCLIBC_VERSION_SNAPSHOT
        default ".2"         if UCLIBC_VERSION_0_9_28
+       default ".1"         if UCLIBC_VERSION_0_9_30 && !UCLIBC_VERSION_NPTL
        default ""
        help
            Default for version 0.9.28 is ".02", for daily snapshot it's just "snapshot"