manual/Makefile: Don't mix pattern rules with normal rules.

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

diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in
index d9c23e0720abe440585efa7365d82380c7d3c2b5..2054e95b5dbc0cea6e0fbd715446401d6d58532a 100644 (file)
--- a/toolchain/eglibc/Config.in
+++ b/toolchain/eglibc/Config.in
@@ -1,7 +1,7 @@
 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.
 
@@ -22,7 +22,15 @@ choice
 
        config EGLIBC_VERSION_2_11
                bool "eglibc 2.11"
-               depends GCC_VERSION_4_3 || GCC_VERSION_4_4
+               depends !GCC_VERSION_LLVM
+
+       config EGLIBC_VERSION_2_12
+               bool "eglibc 2.12"
+               depends !GCC_VERSION_LLVM
+
+       config EGLIBC_VERSION_2_13
+               bool "eglibc 2.13"
+               depends !GCC_VERSION_LLVM
 
        config EGLIBC_VERSION_TRUNK
                bool "eglibc trunk"
@@ -36,9 +44,11 @@ config EGLIBC_REVISION
        default "5887"  if EGLIBC_VERSION_2_6
        default "8588"  if EGLIBC_VERSION_2_7
        default "8587"  if EGLIBC_VERSION_2_8
-       default "8690"  if EGLIBC_VERSION_2_9
-       default "9289"  if EGLIBC_VERSION_2_10
-       default "9306"  if EGLIBC_VERSION_2_11
+       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 "HEAD"  if EGLIBC_VERSION_TRUNK
        default ""
 
@@ -46,4 +56,3 @@ menu "eglibc configuration"
        depends on TOOLCHAINOPTS && USE_EGLIBC
        source toolchain/eglibc/config/Config.in
 endmenu
-