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

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

TODO

@@ -2,6 +2,8 @@ A (slightly) ordered set of tasks for crosstool-NG. Written in a cryptic languag
 
 -- Alexey Neyman (@stilor)
 
+[ ] clean up GDB versions - no X.Y if X.Y.1 is present
+  [ ] Check other packages, leave only the most recent on each branch
 [ ] arm_neon.h - offer as a companion "library" for the target
 [ ] FreeBSD
   [ ] Use 'cc' rather than 'gcc' on the host

config/binutils/binutils.in

@@ -5,19 +5,19 @@ comment "GNU binutils"
 source "config/versions/binutils.in"
 
 config BINUTILS_HAS_HASH_STYLE
-    default y if BINUTILS_MS_2_23
+    default y if BINUTILS_2_23_or_later
     bool
 
 config BINUTILS_HAS_GOLD
-    default y if BINUTILS_MS_2_23
+    default y if BINUTILS_2_23_or_later
     bool
 
 config BINUTILS_HAS_PLUGINS
-    default y if BINUTILS_MS_2_23
+    default y if BINUTILS_2_23_or_later
     bool
 
 config BINUTILS_HAS_PKGVERSION_BUGURL
-    default y if BINUTILS_MS_2_23
+    default y if BINUTILS_2_23_or_later
     bool
 
 # gold only suports the listed architectures

config/binutils/binutils.in.2

@@ -9,64 +9,7 @@ config ELF2FLT_REQUIRES
 
 comment "elf2flt"
 
-choice
-    bool
-    prompt "elf2flt version"
-
-config ELF2FLT_GIT
-    bool
-    prompt "git"
-    depends on CONFIGURE_has_git
-    help
-      Grab the latest version of elf2flt from the CVS repository
-
-config ELF2FLT_CUSTOM
-    bool
-    prompt "Custom elf2flt"
-    depends on EXPERIMENTAL || !CONFIGURE_has_git
-    help
-      The choosen elf2flt version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-endchoice
-
-if ELF2FLT_GIT
-
-config ELF2FLT_GIT_CSET
-    string
-    prompt "git cset"
-    default "6d80ab6c93409e796f85da404bde84b841231531"
-    help
-      Enter the git changeset to use.
-
-      The default currently points to the HEAD of the git tree.
-
-endif # ELF2FLT_GIT
-
-config ELF2FLT_VERSION
-    string
-    default ELF2FLT_GIT_CSET if ELF2FLT_GIT
-    default ELF2FLT_CUSTOM_VERSION if ELF2FLT_CUSTOM
-
-if ELF2FLT_CUSTOM
-
-config ELF2FLT_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom elf2flt source"
-    help
-      Enter the path to the directory or tarball of your source for elf2flt.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, elf2flt, and the version is set
-      below in the custom version string.
-
-config ELF2FLT_CUSTOM_VERSION
-    string
-    prompt "elf2flt custom version number"
-    help
-      Enter the version number for your custom elf2flt.
-
-endif # ELF2FLT_CUSTOM
+source "config/versions/elf2flt.in"
 
 config ELF2FLT_EXTRA_CONFIG_ARRAY
     string

config/cc/gcc.in

@@ -3,7 +3,7 @@
 ## default y
 ## select CC_SUPPORT_CXX if !LIBC_none
 ## select CC_SUPPORT_FORTRAN
-## select CC_SUPPORT_JAVA if !CC_GCC_6_or_later
+## select CC_SUPPORT_JAVA if !GCC_7_or_later
 ## select CC_SUPPORT_ADA
 ## select CC_SUPPORT_OBJC
 ## select CC_SUPPORT_OBJCXX
@@ -32,7 +32,7 @@ config CC_GCC_GOLD
     default y
 
 config CC_GCC_HAS_LIBMPX
-    depends on GCC_MS_5
+    depends on GCC_5_or_later
     bool
 
 config CC_LANG_JAVA_USE_ECJ

config/companion_libs.in

@@ -122,43 +122,60 @@ config NCURSES_TARGET
 config ZLIB
     bool "Build local zlib"
 
+# FIXME this needs to have a list of options
+# [ ] libfoo for build
+# [ ] libfoo for host (if canadian)
+# [ ] libfoo for target
+#     libfoo options -->
+#
+# Then have other packages *set default* for build/host
+# (but not select, so that user can utilize build's or host's system library)
+# and *select* the target (so that we build it if we must, and let user optionally
+# build it if he wants). Upon any of these options LIBFOO_{BUILD,HOST,TARGET}
+# being set, set LIBFOO_ENABLED and use that as a qualifier for submenu.
+# For now, just have comments delineating the libs.
 if ZLIB
+comment "zlib options"
 source "config/companion_libs/zlib.in"
 endif
 if LIBICONV
+comment "libiconv options"
 source "config/companion_libs/libiconv.in"
 endif
 if GETTEXT
+comment "gettext options"
 source "config/companion_libs/gettext.in"
 endif
 if GMP
+comment "GMP options"
 source "config/companion_libs/gmp.in"
 endif
 if MPFR
+comment "MPFR options"
 source "config/companion_libs/mpfr.in"
 endif
 if ISL
+comment "ISL options"
 source "config/companion_libs/isl.in"
 endif
 if CLOOG
+comment "CLooG options"
 source "config/companion_libs/cloog.in"
 endif
 if MPC
+comment "MPC options"
 source "config/companion_libs/mpc.in"
 endif
 if LIBELF || LIBELF_TARGET
-comment "libelf version needed to build for target"
-    depends on !LIBELF
+comment "libelf options"
 source "config/companion_libs/libelf.in"
 endif
 if EXPAT || EXPAT_TARGET
-comment "expat version needed to build for target"
-    depends on !EXPAT
+comment "expat options"
 source "config/companion_libs/expat.in"
 endif
 if NCURSES || NCURSES_TARGET
-comment "ncurses version needed to build for target"
-    depends on !NCURSES
+comment "ncurses options"
 source "config/companion_libs/ncurses.in"
 endif
 

config/companion_libs/cloog.in

@@ -1,51 +1,12 @@
 # CLooG options
 ## depends on OBSOLETE
 
+# TBD: encode these version requirements - how?
 # CLooG 0.18.4 requires ISL 0.12 or newer
 # CLooG 0.18.1/0.18.0 frequires ISL 0.12 or older
-choice
-    bool
-    prompt "CLooG version"
 
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
+source "config/versions/cloog.in"
 
-config CLOOG_V_0_18_4
-    bool
-    prompt "0.18.4"
-    depends on ISL_V_0_12_or_later
-    select CLOOG_0_18_4_or_later
-
-config CLOOG_V_0_18_1
-    bool
-    prompt "0.18.1 (OBSOLETE)"
-    depends on !ISL_V_0_14_or_later
-    depends on OBSOLETE
-    select CLOOG_0_18_or_later
-
-config CLOOG_V_0_18_0
-    bool
-    prompt "0.18.0 (OBSOLETE)"
-    depends on !ISL_V_0_14_or_later
-    depends on OBSOLETE
-    select CLOOG_0_18_or_later
-
-endchoice
-
-config CLOOG_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.18.4" if CLOOG_V_0_18_4
-    default "0.18.1" if CLOOG_V_0_18_1
-    default "0.18.0" if CLOOG_V_0_18_0
-
-config CLOOG_0_18_4_or_later
-    bool
-    select CLOOG_0_18_or_later
-
-config CLOOG_0_18_or_later
-    bool
-
-config CLOOG_NEEDS_AUTORECONF
-    bool
+config CLOOG_HAS_WITH_GMP_ISL_OSL
+	bool
+	default y if CLOOG_0_18_or_later

config/companion_libs/expat.in

@@ -1,25 +1,3 @@
 # expat config file
 
-choice
-    bool
-    prompt "expat version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config EXPAT_V_2_2_1
-    bool
-    prompt "2.2.1"
-
-config EXPAT_V_2_1_1
-    bool
-    prompt "2.1.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config EXPAT_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.2.1" if EXPAT_V_2_2_1
-    default "2.1.1" if EXPAT_V_2_1_1
+source "config/versions/expat.in"

config/companion_libs/gettext.in

@@ -1,25 +1,3 @@
 # gettext options
 
-choice
-    bool
-    prompt "gettext version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config GETTEXT_V_0_19_8_1
-    bool
-    prompt "0.19.8.1"
-
-config GETTEXT_V_0_19_7
-    bool
-    prompt "0.19.7 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config GETTEXT_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.19.8.1" if GETTEXT_V_0_19_8_1
-    default "0.19.7" if GETTEXT_V_0_19_7
+source "config/versions/gettext.in"

config/companion_libs/gmp.in

@@ -1,83 +1,7 @@
 # GMP options
 
-choice
-    bool
-    prompt "GMP version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config GMP_V_6_1_2
-    bool
-    prompt "6.1.2"
-    select GMP_5_0_2_or_later
-
-config GMP_V_6_1_0
-    bool
-    prompt "6.1.0 (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
-
-config GMP_V_6_0_0
-    bool
-    prompt "6.0.0a (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
-
-config GMP_V_5_1_3
-    bool
-    prompt "5.1.3 (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
+source "config/versions/gmp.in"
 
-config GMP_V_5_1_1
+config GMP_HAS_MPBSD
     bool
-    prompt "5.1.1 (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
-
-config GMP_V_5_0_2
-    bool
-    prompt "5.0.2 (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
-
-config GMP_V_5_0_1
-    bool
-    prompt "5.0.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config GMP_V_4_3_2
-    bool
-    prompt "4.3.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config GMP_V_4_3_1
-    bool
-    prompt "4.3.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config GMP_V_4_3_0
-    bool
-    prompt "4.3.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-# To disable --enable-mpbsd
-config GMP_5_0_2_or_later
-    bool
-
-config GMP_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "6.1.2" if GMP_V_6_1_2
-    default "6.1.0" if GMP_V_6_1_0
-    default "6.0.0a" if GMP_V_6_0_0
-    default "5.1.3" if GMP_V_5_1_3
-    default "5.1.1" if GMP_V_5_1_1
-    default "5.0.2" if GMP_V_5_0_2
-    default "5.0.1" if GMP_V_5_0_1
-    default "4.3.2" if GMP_V_4_3_2
-    default "4.3.1" if GMP_V_4_3_1
-    default "4.3.0" if GMP_V_4_3_0
+    default y if !GMP_5_1_or_later