[backfire] scripts: merge r29944 - r29948

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

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 74c38fe2dd3e94586ae8e0148be1593264799aba..31ddb596272f59797432eef66827c7a2500847c8 100644 (file)
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -3,20 +3,25 @@
 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)
+       default UCLIBC_VERSION_0_9_30_1
        help
          Select the version of uClibc you wish to use.
 
-       config UCLIBC_VERSION_0_9_29
-               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
+       config UCLIBC_VERSION_0_9_30_2
+               bool "uClibc 0.9.30.2"
+
+       config UCLIBC_VERSION_0_9_30_3
+               bool "uClibc 0.9.30.3"
 
 endchoice
 
+
+# Debug version.
+
+config UCLIBC_ENABLE_DEBUG
+       bool "Build with debug information"
+       depends on TOOLCHAINOPTS && USE_UCLIBC
+       default n