[toolchain] disable UCLIBC_HAS_XLOCALE and UCLIB_HAS_GLIBC_DIGIT_GROUPING if BUILD_NL...

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

diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in
index 62ed24d..8d84f5a 100644 (file)
--- a/toolchain/eglibc/Config.in
+++ b/toolchain/eglibc/Config.in
@@ -1,31 +1,20 @@
 choice
        prompt "eglibc version" 
        depends on TOOLCHAINOPTS && USE_EGLIBC
-       default EGLIBC_VERSION_2_8
+       default EGLIBC_VERSION_2_12
        help
          Select the version of eglibc you wish to use.
 
-       config EGLIBC_VERSION_2_6
-               bool "eglibc 2.6"
-
-       config EGLIBC_VERSION_2_7
-               bool "eglibc 2.7"
-
-       config EGLIBC_VERSION_2_8
-               bool "eglibc 2.8"
-
-       config EGLIBC_VERSION_2_9
-               bool "eglibc 2.9"
-
-       config EGLIBC_VERSION_2_10
-               bool "eglibc 2.10"
+       config EGLIBC_VERSION_2_12
+               bool "eglibc 2.12"
+               depends !GCC_VERSION_LLVM
 
-       config EGLIBC_VERSION_2_11
-               bool "eglibc 2.11"
+       config EGLIBC_VERSION_2_13
+               bool "eglibc 2.13"
                depends !GCC_VERSION_LLVM
 
-       config EGLIBC_VERSION_2_12
-               bool "eglibc 2.12"
+       config EGLIBC_VERSION_2_14
+               bool "eglibc 2.14"
                depends !GCC_VERSION_LLVM
 
        config EGLIBC_VERSION_TRUNK
@@ -37,13 +26,9 @@ config EGLIBC_REVISION
        string
        prompt "eglibc revision"
        depends on TOOLCHAINOPTS && USE_EGLIBC
-       default "5887"  if EGLIBC_VERSION_2_6
-       default "8588"  if EGLIBC_VERSION_2_7
-       default "8587"  if EGLIBC_VERSION_2_8
-       default "10153" if EGLIBC_VERSION_2_9
-       default "10152" if EGLIBC_VERSION_2_10
-       default "10454" if EGLIBC_VERSION_2_11
        default "10495" if EGLIBC_VERSION_2_12
+       default "13055" if EGLIBC_VERSION_2_13
+       default "14284" if EGLIBC_VERSION_2_14
        default "HEAD"  if EGLIBC_VERSION_TRUNK
        default ""