Convert the rest of packages to new framework

Signed-off-by: Alexey Neyman <stilor@att.net>

1 files changed, 12 insertions, 132 deletions

diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index a85cf21..8f91aa0 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -4,6 +4,7 @@
 ##
 ## select LIBC_SUPPORT_THREADS_LT
 ## select LIBC_SUPPORT_THREADS_NONE
+## select LIBC_SUPPORT_THREADS_NATIVE if UCLIBC_0_9_33_2_or_later
 ## select CC_CORE_PASSES_NEEDED
 ##
 ## help The de-facto standard for embeded linux systems.
@@ -11,6 +12,8 @@
 ## help Highly configurable, thus as feature-rich as you
 ## help need, without compromising for size.
 
+source "config/versions/uClibc-ng.in"
+
 config THREADS
     default "nptl"          if THREADS_NATIVE
     default "linuxthreads"  if THREADS_LT
@@ -20,141 +23,18 @@ comment "'softfp' ABI and uClibc is not entirely tested in crosstool-NG"
 comment "You may experience issues, although it should work just fine"
 endif # ARCH_FLOAT_SOFTFP
 
-config LIBC_UCLIBC_CUSTOM
-    bool
-    prompt "Custom uClibc"
-    depends on EXPERIMENTAL
-    help
-      The choosen uclibc version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if LIBC_UCLIBC_CUSTOM
-
-choice
-    bool
-    prompt "uClibc Version Name"
-
-config LIBC_UCLIBC_CUSTOM_UCLIBC
-    bool "uClibc (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_UCLIBC_0_9_33_2_or_later
-
-config LIBC_UCLIBC_CUSTOM_UCLIBC_NG
-    bool "uClibc-ng (1.0.15 or later)"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_CUSTOM_UCLIBC_NG_OLD
-    bool "uClibc-ng (older than 1.0.15)"
-    select LIBC_UCLIBC_NG_1_0_0_or_later
-
-endchoice
-
-config LIBC_UCLIBC_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom uClibc source"
-    help
-      Enter the path to the directory or tarball of your source for uClibc.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component will be set by the uClibc Version Name
-      option from above, and the version is set below in the custom version
-      string.
-
-config LIBC_UCLIBC_CUSTOM_VERSION
-    string
-    prompt "Custom uClibc Version"
-    help
-      Enter the version number for your custom uClibc.
-      Version 1.0.18 is only enabled in EXPERIMENTAL builds due to issues
-      with static libraries.
-
-config LIBC_VERSION
-    string
-    default LIBC_UCLIBC_CUSTOM_VERSION
-
-endif # LIBC_UCLIBC_CUSTOM
-
-if ! LIBC_UCLIBC_CUSTOM
-
-choice
-    bool
-    prompt "uClibc version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBC_UCLIBC_NG_V_1_0_25
-    bool
-    prompt "1.0.25"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_24
-    bool
-    prompt "1.0.24"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_23
-    bool
-    prompt "1.0.23"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_22
-    bool
-    prompt "1.0.22"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_21
-    bool
-    prompt "1.0.21 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_20
-    bool
-    prompt "1.0.20 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_V_0_9_33_2
-    bool
-    prompt "0.9.33.2 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_UCLIBC_0_9_33_2_or_later
-
-endchoice
-
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.0.25" if LIBC_UCLIBC_NG_V_1_0_25
-    default "1.0.24" if LIBC_UCLIBC_NG_V_1_0_24
-    default "1.0.23" if LIBC_UCLIBC_NG_V_1_0_23
-    default "1.0.22" if LIBC_UCLIBC_NG_V_1_0_22
-    default "1.0.21" if LIBC_UCLIBC_NG_V_1_0_21
-    default "1.0.20" if LIBC_UCLIBC_NG_V_1_0_20
-    default "0.9.33.2" if LIBC_UCLIBC_V_0_9_33_2
-
-endif # ! LIBC_UCLIBC_CUSTOM
-
-config LIBC_UCLIBC_NG_1_0_15_or_later
-    bool
-    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_33_2_or_later
-    bool
-    select LIBC_SUPPORT_THREADS_NATIVE
-    select LIBC_UCLIBC_PARALLEL
-
 config LIBC_UCLIBC_PARALLEL
-    bool
+    def_bool y
+    depends on UCLIBC_0_9_33_2_or_later
 
 config LIBC_UCLIBC_NG
-    bool
+    def_bool y
+    depends on UCLIBC_1_0_0_or_later
+
+# uClibc-ng 1.0.15 did away with 2 implementations of linuxthreads
+config UCLIBC_MERGED_LINUXTHREADS
+    def_bool y
+    depends on UCLIBC_1_0_15_or_later
 
 choice
     bool