Switch comp.libs/tools and debug to new framework.

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

4 files changed, 10 insertions, 447 deletions

diff --git a/config/debug/duma.in b/config/debug/duma.in
index f9e727b8..6039a253 100644
--- a/config/debug/duma.in
+++ b/config/debug/duma.in
@@ -7,6 +7,8 @@
 ## help A memory bound checker, with additional features.
 ## help Formerly known as Electric Fence.
 
+source "config/versions/duma.in"
+
 config DUMA_SO
     bool
     prompt "Build a shared library"
@@ -18,21 +20,3 @@ config DUMA_CUSTOM_WRAPPER
     prompt "Install custom D.U.M.A wrapper"
     default y
     depends on DUMA_SO
-
-choice
-    bool
-    prompt "D.U.M.A. version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config DUMA_V_2_5_15
-    bool
-    prompt "2_5_15"
-
-endchoice
-
-config DUMA_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2_5_15" if DUMA_V_2_5_15
diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index b1d101b0..3fe486f5 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -2,326 +2,20 @@
 
 ## help gdb is the GNU debugger
 
+source "config/versions/gdb.in"
+
 source "config/debug/gdb.in.cross"
 source "config/debug/gdb.in.native"
 source "config/debug/gdb.in.gdbserver"
 
-comment "gdb version"
-
-config GDB_CUSTOM
-    bool
-    prompt "Custom gdb"
-    depends on EXPERIMENTAL
-    select GDB_8_0_or_later
-    help
-      The choosen gdb version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if GDB_CUSTOM
-
-config GDB_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom gdb source"
-    help
-      Enter the path to the directory or tarball of your source for gcc.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, gcc, and the version is set
-      below in the custom version string.
-
-config GDB_CUSTOM_VERSION
-    string
-    prompt "Custom GDB version"
-    help
-      Enter the version number for your custom gdb.
-
-config GDB_VERSION
-    string
-    default GDB_CUSTOM_VERSION
-
-endif # GDB_CUSTOM
-
-if ! GDB_CUSTOM
-
-config DEBUG_GDB_SHOW_LINARO
-    bool
-    prompt "Show Linaro versions"
-    depends on OBSOLETE
-    help
-      Linaro is maintaining some advanced/more stable/experimental versions
-      of gdb, especially for the ARM architecture.
-
-      Those versions have not been blessed by the gdb community (nor have they
-      been cursed either!), but they look to be pretty much stable, and even
-      more stable than the upstream versions. YMMV...
-
-      If you do not know what this Linaro stuff is, then simply say 'n' here,
-      and rest in peace. OTOH, if you know what you are doing, you will be
-      able to use and enjoy :-) the Linaro versions by saying 'y' here.
-
-      Linaro: http://www.linaro.org/
-
-choice
-    bool
-    prompt "gdb version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config GDB_V_8_0
-    bool
-    prompt "8.0"
-    select GDB_8_0_or_later
-
-config GDB_V_7_12_1
-    bool
-    prompt "7.12.1"
-    select GDB_7_12_or_later
-
-config GDB_V_7_11_1
-    bool
-    prompt "7.11.1"
-    select GDB_7_2_or_later
-
-config GDB_V_7_10_1
-    bool
-    prompt "7.10.1 (OBSOLETE)"
-    select GDB_7_2_or_later
-    depends on OBSOLETE
-
-config GDB_V_7_10
-    bool
-    prompt "7.10 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_9_1
-    bool
-    prompt "7.9.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_9
-    bool
-    prompt "7.9 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_8
-    bool
-    prompt "linaro-7.8-2014.09 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_8_2
-    bool
-    prompt "7.8.2 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-
-config GDB_V_7_8_1
-    bool
-    prompt "7.8.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_8
-    bool
-    prompt "7.8 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_7_1
-    bool
-    prompt "linaro-7.7.1-2014.06 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_7_1
-    bool
-    prompt "7.7.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_7
-    bool
-    prompt "linaro-7.7-2014.05 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_7
-    bool
-    prompt "7.7 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_6
-    bool
-    prompt "linaro-7.6.1-2013.10 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    select GDB_7_2_or_later
-
-config GDB_V_7_6_1
-    bool
-    prompt "7.6.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_5
-    bool
-    prompt "linaro-7.5-2012.12 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_5_1
-    bool
-    prompt "7.5.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_4
-    bool
-    prompt "linaro-7.4-2012.06 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_4_1
-    bool
-    prompt "7.4.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_4
-    bool
-    prompt "7.4 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_3
-    bool
-    prompt "linaro-7.3-2011.12 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_3_1
-    bool
-    prompt "7.3.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_3a
-    bool
-    prompt "7.3a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_2a
-    bool
-    prompt "7.2a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_1a
-    bool
-    prompt "7.1a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_0_or_later
-
-config GDB_V_7_0_1a
-    bool
-    prompt "7.0.1a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_0_or_later
-
-config GDB_V_7_0a
-    bool
-    prompt "7.0a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_0_or_later
-
-config GDB_V_6_8a
-    bool
-    prompt "6.8a (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-endif # ! GDB_CUSTOM
-
-config GDB_8_0_or_later
-    bool
-    select GDB_7_12_or_later
-
-config GDB_7_12_or_later
-    bool
-    select GDB_7_2_or_later
-
-config GDB_7_2_or_later
-    bool
-    select GDB_7_0_or_later
-
-config GDB_7_0_or_later
-    bool
-    select GDB_HAS_PKGVERSION_BUGURL
-    select GDB_HAS_PYTHON
-    select GDB_INSTALL_GDBINIT
-
 config GDB_HAS_PKGVERSION_BUGURL
     bool
+    default y if GDB_7_0_or_later
 
 config GDB_HAS_PYTHON
     bool
+    default y if GDB_7_0_or_later
 
 config GDB_INSTALL_GDBINIT
     bool
-
-# GDB 8.0 now requires C++ for build. GDB 7.12 offered a configure
-# switch to fall back to C.
-config GDB_TARGET_DISABLE_CXX_BUILD
-    def_bool y
-    depends on GDB_7_12_or_later && !GDB_8_0_or_later
-
-if ! GDB_CUSTOM
-
-config GDB_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "8.0" if GDB_V_8_0
-    default "7.12.1" if GDB_V_7_12_1
-    default "7.11.1" if GDB_V_7_11_1
-    default "7.10.1" if GDB_V_7_10_1
-    default "7.10" if GDB_V_7_10
-    default "7.9.1" if GDB_V_7_9_1
-    default "7.9" if GDB_V_7_9
-    default "7.8.2" if GDB_V_7_8_2
-    default "linaro-7.8-2014.09" if GDB_V_linaro_7_8
-    default "7.8.1" if GDB_V_7_8_1
-    default "7.8" if GDB_V_7_8
-    default "linaro-7.7.1-2014.06-1" if GDB_V_linaro_7_7_1
-    default "7.7.1" if GDB_V_7_7_1
-    default "linaro-7.7-2014.05" if GDB_V_linaro_7_7
-    default "7.7" if GDB_V_7_7
-    default "linaro-7.6.1-2013.10" if GDB_V_linaro_7_6
-    default "7.6.1" if GDB_V_7_6_1
-    default "linaro-7.5-2012.12" if GDB_V_linaro_7_5
-    default "7.5.1" if GDB_V_7_5_1
-    default "linaro-7.4-2012.06" if GDB_V_linaro_7_4
-    default "7.4.1" if GDB_V_7_4_1
-    default "7.4" if GDB_V_7_4
-    default "linaro-7.3-2011.12" if GDB_V_linaro_7_3
-    default "7.3.1" if GDB_V_7_3_1
-    default "7.3a" if GDB_V_7_3a
-    default "7.2a" if GDB_V_7_2a
-    default "7.1a" if GDB_V_7_1a
-    default "7.0.1a" if GDB_V_7_0_1a
-    default "7.0a" if GDB_V_7_0a
-    default "6.8a" if GDB_V_6_8a
-
-endif # ! GDB_CUSTOM
+    default y if GDB_7_0_or_later
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index fab6b81f..cb511a45 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -8,33 +8,11 @@
 ## help the executed process and the signals which are received by that process.
 ## help It can also intercept and print the system calls executed by the program.
 
-choice
-    bool
-    prompt "ltrace version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LTRACE_V_0_7_3
-    bool
-    prompt "0.7.3"
-
-config LTRACE_V_0_5_3
-    bool
-    prompt "0.5.3 (OBSOLETE)"
-    depends on OBSOLETE
-    select LTRACE_0_5_3_CONFIGURE
-
-endchoice
-
-config LTRACE_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.7.3" if LTRACE_V_0_7_3
-    default "0.5.3" if LTRACE_V_0_5_3
+source "config/versions/ltrace.in"
 
 # Ltrace 0.5.3 had a unique hand-crafted configure script that has to be
 # run differently from any preceding or following releases. This serves
 # as a reminder to remove that code once 0.5.3 support is dropped.
 config LTRACE_0_5_3_CONFIGURE
     bool
+    default y if LTRACE_V_0_5_3
diff --git a/config/debug/strace.in b/config/debug/strace.in
index e77702bf..8062d153 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -2,97 +2,4 @@
 
 ## depends on ! LIBC_bionic
 
-choice
-    bool
-    prompt "strace version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config STRACE_V_4_16
-    bool
-    prompt "4.16"
-
-config STRACE_V_4_15
-    bool
-    prompt "4.15"
-
-config STRACE_V_4_14
-    bool
-    prompt "4.14 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_13
-    bool
-    prompt "4.13 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_12
-    bool
-    prompt "4.12 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_11
-    bool
-    prompt "4.11 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_10
-    bool
-    prompt "4.10 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_9
-    bool
-    prompt "4.9 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_8
-    bool
-    prompt "4.8 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_7
-    bool
-    prompt "4.7 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_6
-    bool
-    prompt "4.6 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_5_20
-    bool
-    prompt "4.5.20 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_5_19
-    bool
-    prompt "4.5.19 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_5_18
-    bool
-    prompt "4.5.18 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config STRACE_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "4.16" if STRACE_V_4_16
-    default "4.15" if STRACE_V_4_15
-    default "4.14" if STRACE_V_4_14
-    default "4.13" if STRACE_V_4_13
-    default "4.12" if STRACE_V_4_12
-    default "4.11" if STRACE_V_4_11
-    default "4.10" if STRACE_V_4_10
-    default "4.9" if STRACE_V_4_9
-    default "4.8" if STRACE_V_4_8
-    default "4.7" if STRACE_V_4_7
-    default "4.6" if STRACE_V_4_6
-    default "4.5.20" if STRACE_V_4_5_20
-    default "4.5.19" if STRACE_V_4_5_19
-    default "4.5.18" if STRACE_V_4_5_18
+source "config/versions/strace.in"