diff options
Diffstat (limited to 'config/libc')
| -rw-r--r-- | config/libc/mingw.in | 13 | ||||
| -rw-r--r-- | config/libc/uClibc.in | 88 | ||||
| -rw-r--r-- | config/libc/uClibc.in.2 | 1 |
3 files changed, 33 insertions, 69 deletions
diff --git a/config/libc/mingw.in b/config/libc/mingw.in index 895bc81..88088e9 100644 --- a/config/libc/mingw.in +++ b/config/libc/mingw.in @@ -14,14 +14,18 @@ choice bool prompt "Windows API version" -# Don't remove next line -# CT_INSERT_VERSION_BELOW - config WINAPI_V_DEVEL bool prompt "devel" depends on EXPERIMENTAL +# Don't remove next line +# CT_INSERT_VERSION_BELOW + +config WINAPI_V_4_0_4 + bool + prompt "4.0.4" + config WINAPI_V_4_0_2 bool prompt "4.0.2" @@ -59,9 +63,10 @@ endchoice config WINAPI_VERSION string prompt "Windows API version" if WINAPI_V_select + default "devel" if WINAPI_V_DEVEL # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW - default "devel" if WINAPI_V_DEVEL + default "4.0.4" if WINAPI_V_4_0_4 default "4.0.2" if WINAPI_V_4_0_2 default "4.0.1" if WINAPI_V_4_0_1 default "4.0.0" if WINAPI_V_4_0_0 diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index 1529642..4e57be0 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -26,62 +26,21 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW -config LIBC_UCLIBC_V_0_9_33_2 - bool - prompt "0.9.33.2" - select LIBC_UCLIBC_0_9_32_or_later - -config LIBC_UCLIBC_V_0_9_33_1 - bool - prompt "0.9.33.1" - select LIBC_UCLIBC_0_9_32_or_later - -config LIBC_UCLIBC_V_0_9_33 - bool - prompt "0.9.33" - select LIBC_UCLIBC_0_9_32_or_later - -config LIBC_UCLIBC_V_0_9_32_1 +config LIBC_UCLIBC_NG_V_1_0_8 bool - prompt "0.9.32.1" - select LIBC_UCLIBC_0_9_32_or_later + prompt "1.0.8" + select LIBC_UCLIBC_NG_1_0_8_or_later -config LIBC_UCLIBC_V_0_9_32 - bool - prompt "0.9.32" - select LIBC_UCLIBC_0_9_32_or_later - -config LIBC_UCLIBC_V_0_9_31 - bool - prompt "0.9.31" - select LIBC_UCLIBC_0_9_30_or_later - -config LIBC_UCLIBC_V_0_9_30_3 - bool - prompt "0.9.30.3" - select LIBC_UCLIBC_0_9_30_or_later - -config LIBC_UCLIBC_V_0_9_30_2 - bool - prompt "0.9.30.2" - select LIBC_UCLIBC_0_9_30_or_later - -config LIBC_UCLIBC_V_0_9_30_1 - bool - prompt "0.9.30.1" - select LIBC_UCLIBC_0_9_30_or_later - -config LIBC_UCLIBC_V_0_9_30 +config LIBC_UCLIBC_V_0_9_33_2 bool - prompt "0.9.30" - select LIBC_UCLIBC_0_9_30_or_later + prompt "0.9.33.2" + select LIBC_UCLIBC_0_9_33_2_or_later config LIBC_UCLIBC_CUSTOM bool prompt "Custom uClibc" depends on EXPERIMENTAL - select LIBC_SUPPORT_THREADS_NATIVE - select LIBC_UCLIBC_0_9_30_or_later + select LIBC_UCLIBC_0_9_33_2_or_later endchoice @@ -101,30 +60,29 @@ config LIBC_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW + default "1.0.8" if LIBC_UCLIBC_NG_V_1_0_8 default "0.9.33.2" if LIBC_UCLIBC_V_0_9_33_2 - default "0.9.33.1" if LIBC_UCLIBC_V_0_9_33_1 - default "0.9.33" if LIBC_UCLIBC_V_0_9_33 - default "0.9.32.1" if LIBC_UCLIBC_V_0_9_32_1 - default "0.9.32" if LIBC_UCLIBC_V_0_9_32 - default "0.9.31" if LIBC_UCLIBC_V_0_9_31 - default "0.9.30.3" if LIBC_UCLIBC_V_0_9_30_3 - default "0.9.30.2" if LIBC_UCLIBC_V_0_9_30_2 - default "0.9.30.1" if LIBC_UCLIBC_V_0_9_30_1 - default "0.9.30" if LIBC_UCLIBC_V_0_9_30 - default "custom" if LIBC_UCLIBC_CUSTOM - -config LIBC_UCLIBC_0_9_32_or_later + +config LIBC_UCLIBC_NG_1_0_8_or_later bool - select LIBC_SUPPORT_THREADS_NATIVE - select LIBC_UCLIBC_0_9_30_or_later + select LIBC_UCLIBC_NG_1_0_0_or_later + +config LIBC_UCLIBC_NG_1_0_0_or_later + bool + select LIBC_UCLIBC_NG + select LIBC_UCLIBC_0_9_33_2_or_later -config LIBC_UCLIBC_0_9_30_or_later +config LIBC_UCLIBC_0_9_33_2_or_later bool + select LIBC_SUPPORT_THREADS_NATIVE select LIBC_UCLIBC_PARALLEL config LIBC_UCLIBC_PARALLEL bool +config LIBC_UCLIBC_NG + bool + choice bool prompt "uClibc verbosity:" @@ -191,5 +149,5 @@ config LIBC_UCLIBC_CONFIG_FILE default "" help Path to the configuration file. - - You _must_ provide one (for now). + + If the file is not provided, we fall back to a default config file. diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2 index 6660c43..1e33db4 100644 --- a/config/libc/uClibc.in.2 +++ b/config/libc/uClibc.in.2 @@ -50,6 +50,7 @@ config LIBC_UCLIBC_LOCALES_PREGEN_DATA bool prompt "Use pregen locales" depends on LIBC_UCLIBC_LOCALES + depends on ! LIBC_UCLIBC_NG default y help If you see issues with using pre-generated locales data, |