From 2231853b856c1deaf032e915d415a640126befa3 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Sun, 6 Sep 2009 11:13:28 +0200 Subject: tools wrapper: fix config dependency The tools wrapper is not needed only for canadian crosses, but also for every other type of toolchain. --- config/toolchain.in | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'config') diff --git a/config/toolchain.in b/config/toolchain.in index 9372dc43..4b2c3686 100644 --- a/config/toolchain.in +++ b/config/toolchain.in @@ -285,10 +285,7 @@ config TARGET_SUFFIX endif # CROSS_NATIVE || CANADIAN -# Kept as a separate if block, even if it could go into the above block, -# because it seems better. No real reason, only that it seems right... -if CANADIAN - +# Necessary for all types of toolchains, at least for gcc > 4.3.x comment "Host specifics" choice @@ -322,6 +319,4 @@ config TOOLS_WRAPPER default "script" if TOOLS_WRAPPER_SCRIPT default "exec" if TOOLS_WRAPPER_EXEC -endif # CROSS_NATIVE || CANADIAN - endmenu -- cgit v1.2.3 From b7d11da128bf9d1ec2a7623d928bb5011d72c2a1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 6 Sep 2009 11:47:40 +0200 Subject: tools wrapper: move choice selection to a more appropriate place Move the tools wrapper choice selection down to the companion libraries sub-menu, to avoid the user going back and forth in the menu. --- config/companion_libs.in | 31 +++++++++++++++++++++++++++++++ config/toolchain.in | 34 ---------------------------------- 2 files changed, 31 insertions(+), 34 deletions(-) (limited to 'config') diff --git a/config/companion_libs.in b/config/companion_libs.in index aa4b63a2..7437d1ff 100644 --- a/config/companion_libs.in +++ b/config/companion_libs.in @@ -91,4 +91,35 @@ config COMP_LIBS_TARGET Please note that for now, crosstool-NG can only build GMP and MPFR so. +choice + bool + prompt "| Install tools wrapper as:" + depends on WRAPPER_NEEDED + default TOOLS_WRAPPER_SHELL + +config TOOLS_WRAPPER_SCRIPT + bool + prompt "shell script" + help + If your host has a shell, then you should say 'Y' here, to use + a (very very simple) shell script as wrapper. + + See docs/overview.txt, section "Tools wrapper". + +config TOOLS_WRAPPER_EXEC + bool + prompt "executable" + help + If your host lacks a shell, then you should say 'Y' here, to use + an executable. + + See docs/overview.txt, section "Tools wrapper". + +endchoice + +config TOOLS_WRAPPER + string + default "script" if TOOLS_WRAPPER_SCRIPT + default "exec" if TOOLS_WRAPPER_EXEC + endmenu diff --git a/config/toolchain.in b/config/toolchain.in index 4b2c3686..4039d9d9 100644 --- a/config/toolchain.in +++ b/config/toolchain.in @@ -285,38 +285,4 @@ config TARGET_SUFFIX endif # CROSS_NATIVE || CANADIAN -# Necessary for all types of toolchains, at least for gcc > 4.3.x -comment "Host specifics" - -choice - bool - prompt "| Install tools wrapper as:" - depends on WRAPPER_NEEDED - default TOOLS_WRAPPER_SHELL - -config TOOLS_WRAPPER_SCRIPT - bool - prompt "shell script" - help - If your host has a shell, then you should say 'Y' here, to use - a (very very simple) shell script as wrapper. - - See docs/overview.txt, section "Tools wrapper". - -config TOOLS_WRAPPER_EXEC - bool - prompt "executable" - help - If your host lacks a shell, then you should say 'Y' here, to use - an executable. - - See docs/overview.txt, section "Tools wrapper". - -endchoice - -config TOOLS_WRAPPER - string - default "script" if TOOLS_WRAPPER_SCRIPT - default "exec" if TOOLS_WRAPPER_EXEC - endmenu -- cgit v1.2.3 From c8ea24328e609e4a911437748b91f8e524bab3a9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 7 Sep 2009 22:03:06 +0200 Subject: companion libs: add latest CLooG/PPL versions Add the latest 0.15.{4,5,6,7} CLoog/PPL. --- config/companion_libs/cloog.in | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'config') diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in index 99779c96..2b6185d8 100644 --- a/config/companion_libs/cloog.in +++ b/config/companion_libs/cloog.in @@ -8,6 +8,22 @@ config CLOOG_V_0_15_3 bool prompt "0.15.3" +config CLOOG_V_0_15_4 + bool + prompt "0.15.4" + +config CLOOG_V_0_15_5 + bool + prompt "0.15.5" + +config CLOOG_V_0_15_6 + bool + prompt "0.15.6" + +config CLOOG_V_0_15_7 + bool + prompt "0.15.7" + # CT_INSERT_VERSION_ABOVE # Don't remove above line! endchoice @@ -15,5 +31,9 @@ endchoice config CLOOG_VERSION string default "0.15.3" if CLOOG_V_0_15_3 + default "0.15.4" if CLOOG_V_0_15_4 + default "0.15.5" if CLOOG_V_0_15_5 + default "0.15.6" if CLOOG_V_0_15_6 + default "0.15.7" if CLOOG_V_0_15_7 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! -- cgit v1.2.3 From ffe6b1cb572adf62e700785f319d6416581847f8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 12 Sep 2009 10:18:36 +0200 Subject: comp-libs/mpc: add latest 0.7 version. --- config/companion_libs/mpc.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config') diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in index 0aa1369a..0a7b1a5f 100644 --- a/config/companion_libs/mpc.in +++ b/config/companion_libs/mpc.in @@ -8,6 +8,10 @@ config MPC_V_0_6 bool prompt "0.6" +config MPC_V_0_7 + bool + prompt "0.7" + # CT_INSERT_VERSION_ABOVE # Don't remove above line! endchoice @@ -15,5 +19,6 @@ endchoice config MPC_VERSION string default "0.6" if MPC_V_0_6 + default "0.7" if MPC_V_0_7 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! -- cgit v1.2.3 From 338f763aef16c4e3a0ea9f9f3515f6f102c5683b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 12 Sep 2009 11:19:30 +0200 Subject: kernel/linux: add latest versions Add 2.6.27.33 as long-term stable, and 2.6.30.6 and 2.6.31. --- config/kernel/linux.in | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/kernel/linux.in b/config/kernel/linux.in index 12ae5a5f..2d7c0d57 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -77,9 +77,9 @@ config KERNEL_V_2_6_26_8 prompt "2.6.26.8 (OBSOLETE)" depends on OBSOLETE -config KERNEL_V_2_6_27_31 +config KERNEL_V_2_6_27_33 bool - prompt "2.6.27.31 (long-term stable)" + prompt "2.6.27.33 (long-term stable)" config KERNEL_V_2_6_28_10 bool @@ -137,6 +137,14 @@ config KERNEL_V_2_6_30_5 bool prompt "2.6.30.5" +config KERNEL_V_2_6_30_6 + bool + prompt "2.6.30.6" + +config KERNEL_V_2_6_31 + bool + prompt "2.6.31" + # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -159,7 +167,7 @@ config KERNEL_VERSION default "2.6.24.7" if KERNEL_V_2_6_24_7 default "2.6.25.20" if KERNEL_V_2_6_25_20 default "2.6.26.8" if KERNEL_V_2_6_26_8 - default "2.6.27.31" if KERNEL_V_2_6_27_31 + default "2.6.27.33" if KERNEL_V_2_6_27_33 default "2.6.28.10" if KERNEL_V_2_6_28_10 default "2.6.29" if KERNEL_V_2_6_29 default "2.6.29.1" if KERNEL_V_2_6_29_1 @@ -174,6 +182,8 @@ config KERNEL_VERSION default "2.6.30.3" if KERNEL_V_2_6_30_3 default "2.6.30.4" if KERNEL_V_2_6_30_4 default "2.6.30.5" if KERNEL_V_2_6_30_5 + default "2.6.30.6" if KERNEL_V_2_6_30_6 + default "2.6.31" if KERNEL_V_2_6_31 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! help -- cgit v1.2.3 From caeb4ada2387a8750acba9c514f0f356e142e777 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 13 Sep 2009 17:51:33 +0200 Subject: config: re-order menu entries so that latest versions are at the top It makes better sense to have latest versions at the top of the choice entries. --- config/binutils/binutils.in | 118 ++++++++++++++-------------- config/cc/gcc.in | 174 ++++++++++++++++++++--------------------- config/companion_libs/cloog.in | 24 +++--- config/companion_libs/gmp.in | 22 +++--- config/companion_libs/mpc.in | 10 +-- config/companion_libs/mpfr.in | 22 +++--- config/debug/dmalloc.in | 10 +-- config/debug/duma.in | 24 +++--- config/debug/gdb.in | 58 +++++++------- config/debug/ltrace.in | 22 +++--- config/debug/strace.in | 40 +++++----- config/kernel/linux.in | 172 ++++++++++++++++++++-------------------- config/libc/eglibc.in | 34 ++++---- config/libc/glibc.in | 53 ++++++------- config/libc/uClibc.in | 46 +++++------ config/tools/libelf.in | 10 +-- 16 files changed, 419 insertions(+), 420 deletions(-) (limited to 'config') diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index 5473d844..c39e5181 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -9,46 +9,47 @@ choice bool prompt "binutils version" -config BINUTILS_V_2_14 +config BINUTILS_V_2_19_51_0_2 bool - prompt "2.14 (OBSOLETE)" - depends on OBSOLETE + prompt "2.19.51.0.2 (EXPERIMENTAL)" + depends on EXPERIMENTAL -config BINUTILS_V_2_15 +config BINUTILS_V_2_19_51_0_1 bool - prompt "2.15 (OBSOLETE)" - depends on OBSOLETE + prompt "2.19.51.0.1 (EXPERIMENTAL)" + depends on EXPERIMENTAL -config BINUTILS_V_2_16_1 +config BINUTILS_V_2_19_50_0_1 bool - prompt "2.16.1" + prompt "2.19.50.0.1 (EXPERIMENTAL)" + depends on EXPERIMENTAL -config BINUTILS_V_2_17 +config BINUTILS_V_2_19_1 bool - prompt "2.17" + prompt "2.19.1" -config BINUTILS_V_2_18 +config BINUTILS_V_2_19 bool - prompt "2.18" + prompt "2.19" -config BINUTILS_V_2_18_50_0_4 +config BINUTILS_V_2_18_93 bool - prompt "2.18.50.0.4 (EXPERIMENTAL)" + prompt "2.18.93 (EXPERIMENTAL)" depends on EXPERIMENTAL -config BINUTILS_V_2_18_50_0_6 +config BINUTILS_V_2_18_92 bool - prompt "2.18.50.0.6 (EXPERIMENTAL)" + prompt "2.18.92 (EXPERIMENTAL)" depends on EXPERIMENTAL -config BINUTILS_V_2_18_50_0_7 +config BINUTILS_V_2_18_91 bool - prompt "2.18.50.0.7 (EXPERIMENTAL)" + prompt "2.18.91 (EXPERIMENTAL)" depends on EXPERIMENTAL -config BINUTILS_V_2_18_50_0_8 +config BINUTILS_V_2_18_90 bool - prompt "2.18.50.0.8 (EXPERIMENTAL)" + prompt "2.18.90 (EXPERIMENTAL)" depends on EXPERIMENTAL config BINUTILS_V_2_18_50_0_9 @@ -56,48 +57,47 @@ config BINUTILS_V_2_18_50_0_9 prompt "2.18.50.0.9 (EXPERIMENTAL)" depends on EXPERIMENTAL -config BINUTILS_V_2_18_90 +config BINUTILS_V_2_18_50_0_8 bool - prompt "2.18.90 (EXPERIMENTAL)" + prompt "2.18.50.0.8 (EXPERIMENTAL)" depends on EXPERIMENTAL -config BINUTILS_V_2_18_91 +config BINUTILS_V_2_18_50_0_7 bool - prompt "2.18.91 (EXPERIMENTAL)" + prompt "2.18.50.0.7 (EXPERIMENTAL)" depends on EXPERIMENTAL -config BINUTILS_V_2_18_92 +config BINUTILS_V_2_18_50_0_6 bool - prompt "2.18.92 (EXPERIMENTAL)" + prompt "2.18.50.0.6 (EXPERIMENTAL)" depends on EXPERIMENTAL -config BINUTILS_V_2_18_93 +config BINUTILS_V_2_18_50_0_4 bool - prompt "2.18.93 (EXPERIMENTAL)" + prompt "2.18.50.0.4 (EXPERIMENTAL)" depends on EXPERIMENTAL -config BINUTILS_V_2_19 +config BINUTILS_V_2_18 bool - prompt "2.19" + prompt "2.18" -config BINUTILS_V_2_19_1 +config BINUTILS_V_2_17 bool - prompt "2.19.1" + prompt "2.17" -config BINUTILS_V_2_19_50_0_1 +config BINUTILS_V_2_16_1 bool - prompt "2.19.50.0.1 (EXPERIMENTAL)" - depends on EXPERIMENTAL + prompt "2.16.1" -config BINUTILS_V_2_19_51_0_1 +config BINUTILS_V_2_15 bool - prompt "2.19.51.0.1 (EXPERIMENTAL)" - depends on EXPERIMENTAL + prompt "2.15 (OBSOLETE)" + depends on OBSOLETE -config BINUTILS_V_2_19_51_0_2 +config BINUTILS_V_2_14 bool - prompt "2.19.51.0.2 (EXPERIMENTAL)" - depends on EXPERIMENTAL + prompt "2.14 (OBSOLETE)" + depends on OBSOLETE # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -105,25 +105,25 @@ endchoice config BINUTILS_VERSION string - default "2.14" if BINUTILS_V_2_14 - default "2.15" if BINUTILS_V_2_15 - default "2.16.1" if BINUTILS_V_2_16_1 - default "2.17" if BINUTILS_V_2_17 - default "2.18" if BINUTILS_V_2_18 - default "2.18.50.0.4" if BINUTILS_V_2_18_50_0_4 - default "2.18.50.0.6" if BINUTILS_V_2_18_50_0_6 - default "2.18.50.0.7" if BINUTILS_V_2_18_50_0_7 - default "2.18.50.0.8" if BINUTILS_V_2_18_50_0_8 - default "2.18.50.0.9" if BINUTILS_V_2_18_50_0_9 - default "2.18.90" if BINUTILS_V_2_18_90 - default "2.18.91" if BINUTILS_V_2_18_91 - default "2.18.92" if BINUTILS_V_2_18_92 - default "2.18.93" if BINUTILS_V_2_18_93 - default "2.19" if BINUTILS_V_2_19 - default "2.19.1" if BINUTILS_V_2_19_1 - default "2.19.50.0.1" if BINUTILS_V_2_19_50_0_1 - default "2.19.51.0.1" if BINUTILS_V_2_19_51_0_1 default "2.19.51.0.2" if BINUTILS_V_2_19_51_0_2 + default "2.19.51.0.1" if BINUTILS_V_2_19_51_0_1 + default "2.19.50.0.1" if BINUTILS_V_2_19_50_0_1 + default "2.19.1" if BINUTILS_V_2_19_1 + default "2.19" if BINUTILS_V_2_19 + default "2.18.93" if BINUTILS_V_2_18_93 + default "2.18.92" if BINUTILS_V_2_18_92 + default "2.18.91" if BINUTILS_V_2_18_91 + default "2.18.90" if BINUTILS_V_2_18_90 + default "2.18.50.0.9" if BINUTILS_V_2_18_50_0_9 + default "2.18.50.0.8" if BINUTILS_V_2_18_50_0_8 + default "2.18.50.0.7" if BINUTILS_V_2_18_50_0_7 + default "2.18.50.0.6" if BINUTILS_V_2_18_50_0_6 + default "2.18.50.0.4" if BINUTILS_V_2_18_50_0_4 + default "2.18" if BINUTILS_V_2_18 + default "2.17" if BINUTILS_V_2_17 + default "2.16.1" if BINUTILS_V_2_16_1 + default "2.15" if BINUTILS_V_2_15 + default "2.14" if BINUTILS_V_2_14 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 1b09d542..39043a7a 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -17,118 +17,118 @@ choice bool prompt "gcc version" -config CC_V_3_2_3 +config CC_V_4_4_1 bool - prompt "3.2.3 (OBSOLETE)" - depends on OBSOLETE + prompt "4.4.1 (EXPERIMENTAL)" + depends on EXPERIMENTAL + select CC_GCC_4_3_or_later + select CC_GCC_4_4_or_later -config CC_V_3_3_6 +config CC_V_4_4_0 bool - prompt "3.3.6 (OBSOLETE)" - depends on OBSOLETE + prompt "4.4.0 (EXPERIMENTAL)" + depends on EXPERIMENTAL + select CC_GCC_4_3_or_later + select CC_GCC_4_4_or_later -config CC_V_3_4_6 +config CC_V_4_3_4 bool - prompt "3.4.6 (OBSOLETE)" - depends on OBSOLETE + prompt "4.3.4" + select CC_GCC_4_3_or_later -config CC_V_4_0_0 +config CC_V_4_3_3 bool - prompt "4.0.0 (OBSOLETE)" - depends on OBSOLETE + prompt "4.3.3" + select CC_GCC_4_3_or_later -config CC_V_4_0_1 +config CC_V_4_3_2 bool - prompt "4.0.1 (OBSOLETE)" - depends on OBSOLETE + prompt "4.3.2" + select CC_GCC_4_3_or_later -config CC_V_4_0_2 +config CC_V_4_3_1 bool - prompt "4.0.2 (OBSOLETE)" - depends on OBSOLETE + prompt "4.3.1" + select CC_GCC_4_3_or_later -config CC_V_4_0_3 +config CC_V_4_3_0 bool - prompt "4.0.3 (OBSOLETE)" - depends on OBSOLETE + prompt "4.3.0 (EXPERIMENTAL)" + depends on EXPERIMENTAL + select CC_GCC_4_3_or_later -config CC_V_4_0_4 +config CC_V_4_2_4 bool - prompt "4.0.4" + prompt "4.2.4" -config CC_V_4_1_0 +config CC_V_4_2_3 bool - prompt "4.1.0 (OBSOLETE)" - depends on OBSOLETE + prompt "4.2.3" -config CC_V_4_1_1 +config CC_V_4_2_2 bool - prompt "4.1.1 (OBSOLETE)" - depends on OBSOLETE + prompt "4.2.2" -config CC_V_4_1_2 +config CC_V_4_2_1 bool - prompt "4.1.2" + prompt "4.2.1" config CC_V_4_2_0 bool prompt "4.2.0" -config CC_V_4_2_1 +config CC_V_4_1_2 bool - prompt "4.2.1" + prompt "4.1.2" -config CC_V_4_2_2 +config CC_V_4_1_1 bool - prompt "4.2.2" + prompt "4.1.1 (OBSOLETE)" + depends on OBSOLETE -config CC_V_4_2_3 +config CC_V_4_1_0 bool - prompt "4.2.3" + prompt "4.1.0 (OBSOLETE)" + depends on OBSOLETE -config CC_V_4_2_4 +config CC_V_4_0_4 bool - prompt "4.2.4" + prompt "4.0.4" -config CC_V_4_3_0 +config CC_V_4_0_3 bool - prompt "4.3.0 (EXPERIMENTAL)" - depends on EXPERIMENTAL - select CC_GCC_4_3_or_later + prompt "4.0.3 (OBSOLETE)" + depends on OBSOLETE -config CC_V_4_3_1 +config CC_V_4_0_2 bool - prompt "4.3.1" - select CC_GCC_4_3_or_later + prompt "4.0.2 (OBSOLETE)" + depends on OBSOLETE -config CC_V_4_3_2 +config CC_V_4_0_1 bool - prompt "4.3.2" - select CC_GCC_4_3_or_later + prompt "4.0.1 (OBSOLETE)" + depends on OBSOLETE -config CC_V_4_3_3 +config CC_V_4_0_0 bool - prompt "4.3.3" - select CC_GCC_4_3_or_later + prompt "4.0.0 (OBSOLETE)" + depends on OBSOLETE -config CC_V_4_3_4 +config CC_V_3_4_6 bool - prompt "4.3.4" - select CC_GCC_4_3_or_later + prompt "3.4.6 (OBSOLETE)" + depends on OBSOLETE -config CC_V_4_4_0 +config CC_V_3_3_6 bool - prompt "4.4.0 (EXPERIMENTAL)" - depends on EXPERIMENTAL - select CC_GCC_4_3_or_later - select CC_GCC_4_4_or_later + prompt "3.3.6 (OBSOLETE)" + depends on OBSOLETE -config CC_V_4_4_1 +config CC_V_3_2_3 bool - prompt "4.4.1 (EXPERIMENTAL)" - depends on EXPERIMENTAL - select CC_GCC_4_3_or_later - select CC_GCC_4_4_or_later + prompt "3.2.3 (OBSOLETE)" + depends on OBSOLETE # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -146,29 +146,29 @@ config CC_GCC_4_4_or_later config CC_VERSION string - default "3.2.3" if CC_V_3_2_3 - default "3.3.6" if CC_V_3_3_6 - default "3.4.6" if CC_V_3_4_6 - default "4.0.0" if CC_V_4_0_0 - default "4.0.1" if CC_V_4_0_1 - default "4.0.2" if CC_V_4_0_2 - default "4.0.3" if CC_V_4_0_3 - default "4.0.4" if CC_V_4_0_4 - default "4.1.0" if CC_V_4_1_0 - default "4.1.1" if CC_V_4_1_1 - default "4.1.2" if CC_V_4_1_2 - default "4.2.0" if CC_V_4_2_0 - default "4.2.1" if CC_V_4_2_1 - default "4.2.2" if CC_V_4_2_2 - default "4.2.3" if CC_V_4_2_3 - default "4.2.4" if CC_V_4_2_4 - default "4.3.0" if CC_V_4_3_0 - default "4.3.1" if CC_V_4_3_1 - default "4.3.2" if CC_V_4_3_2 - default "4.3.3" if CC_V_4_3_3 - default "4.3.4" if CC_V_4_3_4 - default "4.4.0" if CC_V_4_4_0 default "4.4.1" if CC_V_4_4_1 + default "4.4.0" if CC_V_4_4_0 + default "4.3.4" if CC_V_4_3_4 + default "4.3.3" if CC_V_4_3_3 + default "4.3.2" if CC_V_4_3_2 + default "4.3.1" if CC_V_4_3_1 + default "4.3.0" if CC_V_4_3_0 + default "4.2.4" if CC_V_4_2_4 + default "4.2.3" if CC_V_4_2_3 + default "4.2.2" if CC_V_4_2_2 + default "4.2.1" if CC_V_4_2_1 + default "4.2.0" if CC_V_4_2_0 + default "4.1.2" if CC_V_4_1_2 + default "4.1.1" if CC_V_4_1_1 + default "4.1.0" if CC_V_4_1_0 + default "4.0.4" if CC_V_4_0_4 + default "4.0.3" if CC_V_4_0_3 + default "4.0.2" if CC_V_4_0_2 + default "4.0.1" if CC_V_4_0_1 + default "4.0.0" if CC_V_4_0_0 + default "3.4.6" if CC_V_3_4_6 + default "3.3.6" if CC_V_3_3_6 + default "3.2.3" if CC_V_3_2_3 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in index 2b6185d8..7ae6f875 100644 --- a/config/companion_libs/cloog.in +++ b/config/companion_libs/cloog.in @@ -4,25 +4,25 @@ choice bool prompt "CLooG/ppl version" -config CLOOG_V_0_15_3 +config CLOOG_V_0_15_7 bool - prompt "0.15.3" + prompt "0.15.7" -config CLOOG_V_0_15_4 +config CLOOG_V_0_15_6 bool - prompt "0.15.4" + prompt "0.15.6" config CLOOG_V_0_15_5 bool prompt "0.15.5" -config CLOOG_V_0_15_6 +config CLOOG_V_0_15_4 bool - prompt "0.15.6" + prompt "0.15.4" -config CLOOG_V_0_15_7 +config CLOOG_V_0_15_3 bool - prompt "0.15.7" + prompt "0.15.3" # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -30,10 +30,10 @@ endchoice config CLOOG_VERSION string - default "0.15.3" if CLOOG_V_0_15_3 - default "0.15.4" if CLOOG_V_0_15_4 - default "0.15.5" if CLOOG_V_0_15_5 - default "0.15.6" if CLOOG_V_0_15_6 default "0.15.7" if CLOOG_V_0_15_7 + default "0.15.6" if CLOOG_V_0_15_6 + default "0.15.5" if CLOOG_V_0_15_5 + default "0.15.4" if CLOOG_V_0_15_4 + default "0.15.3" if CLOOG_V_0_15_3 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in index a87f4175..5a8c78c5 100644 --- a/config/companion_libs/gmp.in +++ b/config/companion_libs/gmp.in @@ -4,21 +4,21 @@ choice bool prompt "GMP version" -config GMP_V_4_2_2 - bool - prompt "4.2.2" - -config GMP_V_4_2_4 +config GMP_V_4_3_1 bool - prompt "4.2.4" + prompt "4.3.1" config GMP_V_4_3_0 bool prompt "4.3.0" -config GMP_V_4_3_1 +config GMP_V_4_2_4 bool - prompt "4.3.1" + prompt "4.2.4" + +config GMP_V_4_2_2 + bool + prompt "4.2.2" # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -26,9 +26,9 @@ endchoice config GMP_VERSION string - default "4.2.2" if GMP_V_4_2_2 - default "4.2.4" if GMP_V_4_2_4 - default "4.3.0" if GMP_V_4_3_0 default "4.3.1" if GMP_V_4_3_1 + default "4.3.0" if GMP_V_4_3_0 + default "4.2.4" if GMP_V_4_2_4 + default "4.2.2" if GMP_V_4_2_2 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in index 0a7b1a5f..42d5a6f1 100644 --- a/config/companion_libs/mpc.in +++ b/config/companion_libs/mpc.in @@ -4,21 +4,21 @@ choice bool prompt "MPC version" -config MPC_V_0_6 - bool - prompt "0.6" - config MPC_V_0_7 bool prompt "0.7" +config MPC_V_0_6 + bool + prompt "0.6" + # CT_INSERT_VERSION_ABOVE # Don't remove above line! endchoice config MPC_VERSION string - default "0.6" if MPC_V_0_6 default "0.7" if MPC_V_0_7 + default "0.6" if MPC_V_0_6 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in index 910ab4e6..365cd4f1 100644 --- a/config/companion_libs/mpfr.in +++ b/config/companion_libs/mpfr.in @@ -4,21 +4,21 @@ choice bool prompt "MPFR version" -config MPFR_V_2_3_1 - bool - prompt "2.3.1" - -config MPFR_V_2_3_2 +config MPFR_V_2_4_1 bool - prompt "2.3.2" + prompt "2.4.1" config MPFR_V_2_4_0 bool prompt "2.4.0" -config MPFR_V_2_4_1 +config MPFR_V_2_3_2 bool - prompt "2.4.1" + prompt "2.3.2" + +config MPFR_V_2_3_1 + bool + prompt "2.3.1" # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -26,9 +26,9 @@ endchoice config MPFR_VERSION string - default "2.3.1" if MPFR_V_2_3_1 - default "2.3.2" if MPFR_V_2_3_2 - default "2.4.0" if MPFR_V_2_4_0 default "2.4.1" if MPFR_V_2_4_1 + default "2.4.0" if MPFR_V_2_4_0 + default "2.3.2" if MPFR_V_2_3_2 + default "2.3.1" if MPFR_V_2_3_1 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/debug/dmalloc.in b/config/debug/dmalloc.in index 7f4751f5..b643d60d 100644 --- a/config/debug/dmalloc.in +++ b/config/debug/dmalloc.in @@ -7,22 +7,22 @@ choice bool prompt "dmalloc version" +config DMALLOC_V_5_5_2 + bool + prompt "5.5.2" + config DMALLOC_V_5_4_3 bool prompt "5.4.3 (OBSOLETE)" depends on OBSOLETE -config DMALLOC_V_5_5_2 - bool - prompt "5.5.2" - # CT_INSERT_VERSION_ABOVE # Don't remove above line! endchoice config DMALLOC_VERSION string - default "5.4.3" if DMALLOC_V_5_4_3 default "5.5.2" if DMALLOC_V_5_5_2 + default "5.4.3" if DMALLOC_V_5_4_3 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/debug/duma.in b/config/debug/duma.in index 987be65a..7530489a 100644 --- a/config/debug/duma.in +++ b/config/debug/duma.in @@ -21,25 +21,25 @@ choice bool prompt "D.U.M.A. version" -config DUMA_V_2_5_1 +config DUMA_V_2_5_15 bool - prompt "2_5_1" + prompt "2_5_15" -config DUMA_V_2_5_8 +config DUMA_V_2_5_14 bool - prompt "2_5_8" + prompt "2_5_14" config DUMA_V_2_5_12 bool prompt "2_5_12" -config DUMA_V_2_5_14 +config DUMA_V_2_5_8 bool - prompt "2_5_14" + prompt "2_5_8" -config DUMA_V_2_5_15 +config DUMA_V_2_5_1 bool - prompt "2_5_15" + prompt "2_5_1" # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -47,10 +47,10 @@ endchoice config DUMA_VERSION string - default "2_5_1" if DUMA_V_2_5_1 - default "2_5_8" if DUMA_V_2_5_8 - default "2_5_12" if DUMA_V_2_5_12 - default "2_5_14" if DUMA_V_2_5_14 default "2_5_15" if DUMA_V_2_5_15 + default "2_5_14" if DUMA_V_2_5_14 + default "2_5_12" if DUMA_V_2_5_12 + default "2_5_8" if DUMA_V_2_5_8 + default "2_5_1" if DUMA_V_2_5_1 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/debug/gdb.in b/config/debug/gdb.in index f21123db..79c9cd87 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -97,54 +97,54 @@ choice prompt "gdb version" depends on GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER -config GDB_V_6_4 +config GDB_V_snapshot bool - prompt "6.4 (OBSOLETE)" - depends on OBSOLETE + prompt "snapshot (EXPERIMENTAL)" + depends on EXPERIMENTAL + depends on ! GDB_CROSS_INSIGHT -config GDB_V_6_5 +config GDB_V_6_8 bool - prompt "6.5 (OBSOLETE)" - depends on OBSOLETE + prompt "6.8" -config GDB_V_6_6 +config GDB_V_6_7_1 bool - prompt "6.6" + prompt "6.7.1 (EXPERIMENTAL)" + depends on EXPERIMENTAL config GDB_V_6_7 bool prompt "6.7 (EXPERIMENTAL)" depends on EXPERIMENTAL -config GDB_V_6_7_1 +config GDB_V_6_6 bool - prompt "6.7.1 (EXPERIMENTAL)" - depends on EXPERIMENTAL + prompt "6.6" -config GDB_V_6_8 +config GDB_V_6_5 bool - prompt "6.8" + prompt "6.5 (OBSOLETE)" + depends on OBSOLETE + +config GDB_V_6_4 + bool + prompt "6.4 (OBSOLETE)" + depends on OBSOLETE # CT_INSERT_VERSION_ABOVE # Don't remove above line! -config GDB_V_snapshot - bool - prompt "snapshot (EXPERIMENTAL)" - depends on EXPERIMENTAL - depends on ! GDB_CROSS_INSIGHT - endchoice config GDB_VERSION string default "snapshot" if GDB_V_snapshot - default "6.4" if GDB_V_6_4 - default "6.5" if GDB_V_6_5 - default "6.6" if GDB_V_6_6 - default "6.7" if GDB_V_6_7 - default "6.7.1" if GDB_V_6_7_1 default "6.8" if GDB_V_6_8 + default "6.7.1" if GDB_V_6_7_1 + default "6.7" if GDB_V_6_7 + default "6.6" if GDB_V_6_6 + default "6.5" if GDB_V_6_5 + default "6.4" if GDB_V_6_4 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! @@ -156,19 +156,19 @@ choice bool prompt "ncurses version" -config NCURSES_V_5_6 - bool - prompt "5.6" - config NCURSES_V_5_7 bool prompt "5.7" +config NCURSES_V_5_6 + bool + prompt "5.6" + endchoice config NCURSES_VERSION string - default "5.6" if NCURSES_V_5_6 default "5.7" if NCURSES_V_5_7 + default "5.6" if NCURSES_V_5_6 endif # GDB_NATIVE --> ncurses diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index 4b141e01..7fd6baff 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -12,22 +12,22 @@ choice bool prompt "ltrace version" -config LTRACE_V_0_4 - bool - prompt "0.4" - -config LTRACE_V_0_5 +config LTRACE_V_0_5_2 bool - prompt "0.5" + prompt "0.5.2" config LTRACE_V_0_5_1 bool prompt "0.5.1 (EXPERIMENTAL)" depends on EXPERIMENTAL -config LTRACE_V_0_5_2 +config LTRACE_V_0_5 bool - prompt "0.5.2" + prompt "0.5" + +config LTRACE_V_0_4 + bool + prompt "0.4" # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -35,9 +35,9 @@ endchoice config LTRACE_VERSION string - default "0.4" if LTRACE_V_0_4 - default "0.5" if LTRACE_V_0_5 - default "0.5.1" if LTRACE_V_0_5_1 default "0.5.2" if LTRACE_V_0_5_2 + default "0.5.1" if LTRACE_V_0_5_1 + default "0.5" if LTRACE_V_0_5 + default "0.4" if LTRACE_V_0_4 # CT_INSERT_VERSION_STRING_ABOVE # # Don't remove above line! diff --git a/config/debug/strace.in b/config/debug/strace.in index eae6d016..c46d540b 100644 --- a/config/debug/strace.in +++ b/config/debug/strace.in @@ -6,32 +6,32 @@ choice bool prompt "strace version" -config STRACE_V_4_5 - bool - prompt "4.5 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_5_14 +config STRACE_V_4_5_18 bool - prompt "4.5.14 (OBSOLETE)" - depends on OBSOLETE + prompt "4.5.18 (EXPERIMENTAL)" + depends on EXPERIMENTAL -config STRACE_V_4_5_15 +config STRACE_V_4_5_17 bool - prompt "4.5.15" + prompt "4.5.17" config STRACE_V_4_5_16 bool prompt "4.5.16" -config STRACE_V_4_5_17 +config STRACE_V_4_5_15 bool - prompt "4.5.17" + prompt "4.5.15" -config STRACE_V_4_5_18 +config STRACE_V_4_5_14 bool - prompt "4.5.18 (EXPERIMENTAL)" - depends on EXPERIMENTAL + prompt "4.5.14 (OBSOLETE)" + depends on OBSOLETE + +config STRACE_V_4_5 + bool + prompt "4.5 (OBSOLETE)" + depends on OBSOLETE # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -39,11 +39,11 @@ endchoice config STRACE_VERSION string - default "4.5" if STRACE_V_4_5 - default "4.5.14" if STRACE_V_4_5_14 - default "4.5.15" if STRACE_V_4_5_15 - default "4.5.16" if STRACE_V_4_5_16 - default "4.5.17" if STRACE_V_4_5_17 default "4.5.18" if STRACE_V_4_5_18 + default "4.5.17" if STRACE_V_4_5_17 + default "4.5.16" if STRACE_V_4_5_16 + default "4.5.15" if STRACE_V_4_5_15 + default "4.5.14" if STRACE_V_4_5_14 + default "4.5" if STRACE_V_4_5 # CT_INSERT_VERSION_STRING_ABOVE # # Don't remove above line! diff --git a/config/kernel/linux.in b/config/kernel/linux.in index 2d7c0d57..f96f5893 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -32,118 +32,118 @@ choice bool prompt "Linux kernel version" -config KERNEL_V_2_6_18_8 - bool - prompt "2.6.18.8 (OBSOLETE)" - depends on OBSOLETE - -config KERNEL_V_2_6_19_7 +config KERNEL_V_2_6_31 bool - prompt "2.6.19.7 (OBSOLETE)" - depends on OBSOLETE + prompt "2.6.31" -config KERNEL_V_2_6_20_21 +config KERNEL_V_2_6_30_6 bool - prompt "2.6.20.21 (OBSOLETE)" - depends on OBSOLETE + prompt "2.6.30.6" -config KERNEL_V_2_6_21_7 +config KERNEL_V_2_6_30_5 bool - prompt "2.6.21.7 (OBSOLETE)" - depends on OBSOLETE + prompt "2.6.30.5" -config KERNEL_V_2_6_22_19 +config KERNEL_V_2_6_30_4 bool - prompt "2.6.22.19 (OBSOLETE)" - depends on OBSOLETE + prompt "2.6.30.4" -config KERNEL_V_2_6_23_17 +config KERNEL_V_2_6_30_3 bool - prompt "2.6.23.17 (OBSOLETE)" - depends on OBSOLETE + prompt "2.6.30.3" -config KERNEL_V_2_6_24_7 +config KERNEL_V_2_6_30_2 bool - prompt "2.6.24.7 (OBSOLETE)" - depends on OBSOLETE + prompt "2.6.30.2" -config KERNEL_V_2_6_25_20 +config KERNEL_V_2_6_30_1 bool - prompt "2.6.25.20 (OBSOLETE)" - depends on OBSOLETE + prompt "2.6.30.1" -config KERNEL_V_2_6_26_8 +config KERNEL_V_2_6_30 bool - prompt "2.6.26.8 (OBSOLETE)" - depends on OBSOLETE + prompt "2.6.30" -config KERNEL_V_2_6_27_33 +config KERNEL_V_2_6_29_6 bool - prompt "2.6.27.33 (long-term stable)" + prompt "2.6.29.6" -config KERNEL_V_2_6_28_10 +config KERNEL_V_2_6_29_5 bool - prompt "2.6.28.10" + prompt "2.6.29.5" -config KERNEL_V_2_6_29 +config KERNEL_V_2_6_29_4 bool - prompt "2.6.29" + prompt "2.6.29.4" -config KERNEL_V_2_6_29_1 +config KERNEL_V_2_6_29_3 bool - prompt "2.6.29.1" + prompt "2.6.29.3" config KERNEL_V_2_6_29_2 bool prompt "2.6.29.2" -config KERNEL_V_2_6_29_3 +config KERNEL_V_2_6_29_1 bool - prompt "2.6.29.3" + prompt "2.6.29.1" -config KERNEL_V_2_6_29_4 +config KERNEL_V_2_6_29 bool - prompt "2.6.29.4" + prompt "2.6.29" -config KERNEL_V_2_6_29_5 +config KERNEL_V_2_6_28_10 bool - prompt "2.6.29.5" + prompt "2.6.28.10" -config KERNEL_V_2_6_29_6 +config KERNEL_V_2_6_27_33 bool - prompt "2.6.29.6" + prompt "2.6.27.33 (long-term stable)" -config KERNEL_V_2_6_30 +config KERNEL_V_2_6_26_8 bool - prompt "2.6.30" + prompt "2.6.26.8 (OBSOLETE)" + depends on OBSOLETE -config KERNEL_V_2_6_30_1 +config KERNEL_V_2_6_25_20 bool - prompt "2.6.30.1" + prompt "2.6.25.20 (OBSOLETE)" + depends on OBSOLETE -config KERNEL_V_2_6_30_2 +config KERNEL_V_2_6_24_7 bool - prompt "2.6.30.2" + prompt "2.6.24.7 (OBSOLETE)" + depends on OBSOLETE -config KERNEL_V_2_6_30_3 +config KERNEL_V_2_6_23_17 bool - prompt "2.6.30.3" + prompt "2.6.23.17 (OBSOLETE)" + depends on OBSOLETE -config KERNEL_V_2_6_30_4 +config KERNEL_V_2_6_22_19 bool - prompt "2.6.30.4" + prompt "2.6.22.19 (OBSOLETE)" + depends on OBSOLETE -config KERNEL_V_2_6_30_5 +config KERNEL_V_2_6_21_7 bool - prompt "2.6.30.5" + prompt "2.6.21.7 (OBSOLETE)" + depends on OBSOLETE -config KERNEL_V_2_6_30_6 +config KERNEL_V_2_6_20_21 bool - prompt "2.6.30.6" + prompt "2.6.20.21 (OBSOLETE)" + depends on OBSOLETE -config KERNEL_V_2_6_31 +config KERNEL_V_2_6_19_7 bool - prompt "2.6.31" + prompt "2.6.19.7 (OBSOLETE)" + depends on OBSOLETE + +config KERNEL_V_2_6_18_8 + bool + prompt "2.6.18.8 (OBSOLETE)" + depends on OBSOLETE # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -158,32 +158,32 @@ endchoice config KERNEL_VERSION string prompt "Kernel version" if KERNEL_V_select - default "2.6.18.8" if KERNEL_V_2_6_18_8 - default "2.6.19.7" if KERNEL_V_2_6_19_7 - default "2.6.20.21" if KERNEL_V_2_6_20_21 - default "2.6.21.7" if KERNEL_V_2_6_21_7 - default "2.6.22.19" if KERNEL_V_2_6_22_19 - default "2.6.23.17" if KERNEL_V_2_6_23_17 - default "2.6.24.7" if KERNEL_V_2_6_24_7 - default "2.6.25.20" if KERNEL_V_2_6_25_20 - default "2.6.26.8" if KERNEL_V_2_6_26_8 - default "2.6.27.33" if KERNEL_V_2_6_27_33 - default "2.6.28.10" if KERNEL_V_2_6_28_10 - default "2.6.29" if KERNEL_V_2_6_29 - default "2.6.29.1" if KERNEL_V_2_6_29_1 - default "2.6.29.2" if KERNEL_V_2_6_29_2 - default "2.6.29.3" if KERNEL_V_2_6_29_3 - default "2.6.29.4" if KERNEL_V_2_6_29_4 - default "2.6.29.5" if KERNEL_V_2_6_29_5 - default "2.6.29.6" if KERNEL_V_2_6_29_6 - default "2.6.30" if KERNEL_V_2_6_30 - default "2.6.30.1" if KERNEL_V_2_6_30_1 - default "2.6.30.2" if KERNEL_V_2_6_30_2 - default "2.6.30.3" if KERNEL_V_2_6_30_3 - default "2.6.30.4" if KERNEL_V_2_6_30_4 - default "2.6.30.5" if KERNEL_V_2_6_30_5 - default "2.6.30.6" if KERNEL_V_2_6_30_6 default "2.6.31" if KERNEL_V_2_6_31 + default "2.6.30.6" if KERNEL_V_2_6_30_6 + default "2.6.30.5" if KERNEL_V_2_6_30_5 + default "2.6.30.4" if KERNEL_V_2_6_30_4 + default "2.6.30.3" if KERNEL_V_2_6_30_3 + default "2.6.30.2" if KERNEL_V_2_6_30_2 + default "2.6.30.1" if KERNEL_V_2_6_30_1 + default "2.6.30" if KERNEL_V_2_6_30 + default "2.6.29.6" if KERNEL_V_2_6_29_6 + default "2.6.29.5" if KERNEL_V_2_6_29_5 + default "2.6.29.4" if KERNEL_V_2_6_29_4 + default "2.6.29.3" if KERNEL_V_2_6_29_3 + default "2.6.29.2" if KERNEL_V_2_6_29_2 + default "2.6.29.1" if KERNEL_V_2_6_29_1 + default "2.6.29" if KERNEL_V_2_6_29 + default "2.6.28.10" if KERNEL_V_2_6_28_10 + default "2.6.27.33" if KERNEL_V_2_6_27_33 + default "2.6.26.8" if KERNEL_V_2_6_26_8 + default "2.6.25.20" if KERNEL_V_2_6_25_20 + default "2.6.24.7" if KERNEL_V_2_6_24_7 + default "2.6.23.17" if KERNEL_V_2_6_23_17 + default "2.6.22.19" if KERNEL_V_2_6_22_19 + default "2.6.21.7" if KERNEL_V_2_6_21_7 + default "2.6.20.21" if KERNEL_V_2_6_20_21 + default "2.6.19.7" if KERNEL_V_2_6_19_7 + default "2.6.18.8" if KERNEL_V_2_6_18_8 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! help diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in index ced8d953..c98ebd52 100644 --- a/config/libc/eglibc.in +++ b/config/libc/eglibc.in @@ -16,29 +16,29 @@ choice bool prompt "eglibc version" -config EGLIBC_V_2_5 - bool - prompt "2_5" - -config EGLIBC_V_2_6 +config LIBC_V_2_10 bool - prompt "2_6" + prompt "2_10" -config EGLIBC_V_2_7 +config EGLIBC_V_2_9 bool - prompt "2_7" + prompt "2_9" config EGLIBC_V_2_8 bool prompt "2_8" -config EGLIBC_V_2_9 +config EGLIBC_V_2_7 bool - prompt "2_9" + prompt "2_7" -config LIBC_V_2_10 +config EGLIBC_V_2_6 bool - prompt "2_10" + prompt "2_6" + +config EGLIBC_V_2_5 + bool + prompt "2_5" # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -54,12 +54,12 @@ endchoice config LIBC_VERSION string default "trunk" if EGLIBC_V_TRUNK - default "2_5" if EGLIBC_V_2_5 - default "2_6" if EGLIBC_V_2_6 - default "2_7" if EGLIBC_V_2_7 - default "2_8" if EGLIBC_V_2_8 - default "2_9" if EGLIBC_V_2_9 default "2_10" if LIBC_V_2_10 + default "2_9" if EGLIBC_V_2_9 + default "2_8" if EGLIBC_V_2_8 + default "2_7" if EGLIBC_V_2_7 + default "2_6" if EGLIBC_V_2_6 + default "2_5" if EGLIBC_V_2_5 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/libc/glibc.in b/config/libc/glibc.in index b9ef99f9..310cc8f9 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -12,40 +12,40 @@ choice bool prompt "glibc version" -config LIBC_V_2_3_6 - bool - prompt "2.3.6 (OBSOLETE)" - depends on OBSOLETE - -config LIBC_V_2_5 +config LIBC_V_2_9 bool - prompt "2.5" + prompt "2.9" + select LIBC_GLIBC_2_8_or_later -config LIBC_V_2_5_1 +config LIBC_V_2_8 bool - prompt "2.5.1" + prompt "2.8" + select LIBC_GLIBC_2_8_or_later -config LIBC_V_2_6 +config LIBC_V_2_7 bool - prompt "2.6" + prompt "2.7" config LIBC_V_2_6_1 bool prompt "2.6.1" -config LIBC_V_2_7 +config LIBC_V_2_6 bool - prompt "2.7" + prompt "2.6" -config LIBC_V_2_8 +config LIBC_V_2_5_1 bool - prompt "2.8" - select LIBC_GLIBC_2_8_or_later + prompt "2.5.1" -config LIBC_V_2_9 +config LIBC_V_2_5 bool - prompt "2.9" - select LIBC_GLIBC_2_8_or_later + prompt "2.5" + +config LIBC_V_2_3_6 + bool + prompt "2.3.6 (OBSOLETE)" + depends on OBSOLETE # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -66,15 +66,14 @@ config LIBC_VERSION string prompt "Enter date (YYYYMMDD)" if LIBC_V_date default "latest" if LIBC_V_LATEST - default "2.3.6" if LIBC_V_2_3_6 - default "2.4" if LIBC_V_2_4 - default "2.5" if LIBC_V_2_5 - default "2.5.1" if LIBC_V_2_5_1 - default "2.6" if LIBC_V_2_6 - default "2.6.1" if LIBC_V_2_6_1 - default "2.7" if LIBC_V_2_7 - default "2.8" if LIBC_V_2_8 default "2.9" if LIBC_V_2_9 + default "2.8" if LIBC_V_2_8 + default "2.7" if LIBC_V_2_7 + default "2.6.1" if LIBC_V_2_6_1 + default "2.6" if LIBC_V_2_6 + default "2.5.1" if LIBC_V_2_5_1 + default "2.5" if LIBC_V_2_5 + default "2.3.6" if LIBC_V_2_3_6 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index dbd659cf..e583b765 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -12,38 +12,38 @@ choice bool prompt "uClibc version" -config LIBC_V_0_9_28 +config LIBC_V_0_9_30_1 bool - prompt "0.9.28 (OBSOLETE)" - depends on OBSOLETE + prompt "0.9.30.1" + select LIBC_UCLIBC_0_9_30_or_later -config LIBC_V_0_9_28_1 +config LIBC_V_0_9_30 bool - prompt "0.9.28.1 (OBSOLETE)" - depends on OBSOLETE + prompt "0.9.30" + select LIBC_UCLIBC_0_9_30_or_later -config LIBC_V_0_9_28_2 +config LIBC_V_0_9_29 bool - prompt "0.9.28.2 (OBSOLETE)" - depends on OBSOLETE + prompt "0.9.29" config LIBC_V_0_9_28_3 bool prompt "0.9.28.3" -config LIBC_V_0_9_29 +config LIBC_V_0_9_28_2 bool - prompt "0.9.29" + prompt "0.9.28.2 (OBSOLETE)" + depends on OBSOLETE -config LIBC_V_0_9_30 +config LIBC_V_0_9_28_1 bool - prompt "0.9.30" - select LIBC_UCLIBC_0_9_30_or_later + prompt "0.9.28.1 (OBSOLETE)" + depends on OBSOLETE -config LIBC_V_0_9_30_1 +config LIBC_V_0_9_28 bool - prompt "0.9.30.1" - select LIBC_UCLIBC_0_9_30_or_later + prompt "0.9.28 (OBSOLETE)" + depends on OBSOLETE # CT_INSERT_VERSION_ABOVE # Don't remove above line! @@ -64,13 +64,13 @@ config LIBC_VERSION string prompt "Enter date (YYYYMMDD)" if LIBC_V_specific_date default "snapshot" if LIBC_V_snapshot - default "0.9.28" if LIBC_V_0_9_28 - default "0.9.28.1" if LIBC_V_0_9_28_1 - default "0.9.28.2" if LIBC_V_0_9_28_2 - default "0.9.28.3" if LIBC_V_0_9_28_3 - default "0.9.29" if LIBC_V_0_9_29 - default "0.9.30" if LIBC_V_0_9_30 default "0.9.30.1" if LIBC_V_0_9_30_1 + default "0.9.30" if LIBC_V_0_9_30 + default "0.9.29" if LIBC_V_0_9_29 + default "0.9.28.3" if LIBC_V_0_9_28_3 + default "0.9.28.2" if LIBC_V_0_9_28_2 + default "0.9.28.1" if LIBC_V_0_9_28_1 + default "0.9.28" if LIBC_V_0_9_28 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/tools/libelf.in b/config/tools/libelf.in index 3002a15a..1513fb09 100644 --- a/config/tools/libelf.in +++ b/config/tools/libelf.in @@ -9,21 +9,21 @@ choice bool prompt "libelf version" -config LIBELF_V_0_8_10 - bool - prompt "0.8.10" - config LIBELF_V_0_8_11 bool prompt "0.8.11" +config LIBELF_V_0_8_10 + bool + prompt "0.8.10" + # CT_INSERT_VERSION_ABOVE # Don't remove above line! endchoice config LIBELF_VERSION string - default "0.8.10" if LIBELF_V_0_8_10 default "0.8.11" if LIBELF_V_0_8_11 + default "0.8.10" if LIBELF_V_0_8_10 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! -- cgit v1.2.3 From 0c6375595702e370b3e5784eabdc87f0f5282fed Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 13 Sep 2009 18:38:06 +0200 Subject: scripts: add new version at top of choice Add new versions at the top of the choice menu, not at the bottom. --- config/binutils/binutils.in | 8 ++++---- config/binutils/elf2flt.in | 8 ++++---- config/cc/gcc.in | 8 ++++---- config/companion_libs/cloog.in | 8 ++++---- config/companion_libs/gmp.in | 8 ++++---- config/companion_libs/mpc.in | 8 ++++---- config/companion_libs/mpfr.in | 8 ++++---- config/companion_libs/ppl.in | 8 ++++---- config/debug/dmalloc.in | 8 ++++---- config/debug/duma.in | 8 ++++---- config/debug/gdb.in | 21 ++++++++++----------- config/debug/ltrace.in | 8 ++++---- config/debug/strace.in | 8 ++++---- config/kernel/linux.in | 9 ++++----- config/libc/eglibc.in | 11 +++++------ config/libc/glibc.in | 11 +++++------ config/libc/newlib.in | 10 ++++------ config/libc/uClibc.in | 11 +++++------ config/tools/libelf.in | 8 ++++---- scripts/addToolVersion.sh | 18 +++++++++--------- 20 files changed, 94 insertions(+), 101 deletions(-) (limited to 'config') diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index c39e5181..904dad2e 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -8,6 +8,8 @@ config BINUTILS_VERSION choice bool prompt "binutils version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config BINUTILS_V_2_19_51_0_2 bool @@ -99,12 +101,12 @@ config BINUTILS_V_2_14 prompt "2.14 (OBSOLETE)" depends on OBSOLETE -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! endchoice config BINUTILS_VERSION string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "2.19.51.0.2" if BINUTILS_V_2_19_51_0_2 default "2.19.51.0.1" if BINUTILS_V_2_19_51_0_1 default "2.19.50.0.1" if BINUTILS_V_2_19_50_0_1 @@ -124,8 +126,6 @@ config BINUTILS_VERSION default "2.16.1" if BINUTILS_V_2_16_1 default "2.15" if BINUTILS_V_2_15 default "2.14" if BINUTILS_V_2_14 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! config BINUTILS_EXTRA_CONFIG string diff --git a/config/binutils/elf2flt.in b/config/binutils/elf2flt.in index 0b1ef726..c46e599a 100644 --- a/config/binutils/elf2flt.in +++ b/config/binutils/elf2flt.in @@ -10,6 +10,8 @@ config ELF2FLT_VERSION choice bool prompt "elf2flt version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config ELF2FLT_CVSHEAD bool @@ -21,8 +23,6 @@ config ELF2FLT_CVS_SNAPSHOT bool prompt "CVS Snapshot" -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! endchoice config ELF2FLT_CVS_SNAPSHOT_SPEC @@ -37,8 +37,8 @@ config ELF2FLT_CVS_SNAPSHOT_SPEC config ELF2FLT_VERSION string default "head" if ELF2FLT_CVSHEAD -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW config ELF2FLT_EXTRA_CONFIG string diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 39043a7a..d0ff4ab7 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -16,6 +16,8 @@ config CC_gcc choice bool prompt "gcc version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config CC_V_4_4_1 bool @@ -130,8 +132,6 @@ config CC_V_3_2_3 prompt "3.2.3 (OBSOLETE)" depends on OBSOLETE -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! endchoice config CC_GCC_4_3_or_later @@ -146,6 +146,8 @@ config CC_GCC_4_4_or_later config CC_VERSION string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "4.4.1" if CC_V_4_4_1 default "4.4.0" if CC_V_4_4_0 default "4.3.4" if CC_V_4_3_4 @@ -169,8 +171,6 @@ config CC_VERSION default "3.4.6" if CC_V_3_4_6 default "3.3.6" if CC_V_3_3_6 default "3.2.3" if CC_V_3_2_3 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! config CC_CXA_ATEXIT bool diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in index 7ae6f875..75ddb149 100644 --- a/config/companion_libs/cloog.in +++ b/config/companion_libs/cloog.in @@ -3,6 +3,8 @@ choice bool prompt "CLooG/ppl version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config CLOOG_V_0_15_7 bool @@ -24,16 +26,14 @@ config CLOOG_V_0_15_3 bool prompt "0.15.3" -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! endchoice config CLOOG_VERSION string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "0.15.7" if CLOOG_V_0_15_7 default "0.15.6" if CLOOG_V_0_15_6 default "0.15.5" if CLOOG_V_0_15_5 default "0.15.4" if CLOOG_V_0_15_4 default "0.15.3" if CLOOG_V_0_15_3 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in index 5a8c78c5..75628d9a 100644 --- a/config/companion_libs/gmp.in +++ b/config/companion_libs/gmp.in @@ -3,6 +3,8 @@ choice bool prompt "GMP version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config GMP_V_4_3_1 bool @@ -20,15 +22,13 @@ config GMP_V_4_2_2 bool prompt "4.2.2" -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! endchoice config GMP_VERSION string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "4.3.1" if GMP_V_4_3_1 default "4.3.0" if GMP_V_4_3_0 default "4.2.4" if GMP_V_4_2_4 default "4.2.2" if GMP_V_4_2_2 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in index 42d5a6f1..27e9b906 100644 --- a/config/companion_libs/mpc.in +++ b/config/companion_libs/mpc.in @@ -3,6 +3,8 @@ choice bool prompt "MPC version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config MPC_V_0_7 bool @@ -12,13 +14,11 @@ config MPC_V_0_6 bool prompt "0.6" -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! endchoice config MPC_VERSION string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "0.7" if MPC_V_0_7 default "0.6" if MPC_V_0_6 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in index 365cd4f1..61f057a1 100644 --- a/config/companion_libs/mpfr.in +++ b/config/companion_libs/mpfr.in @@ -3,6 +3,8 @@ choice bool prompt "MPFR version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config MPFR_V_2_4_1 bool @@ -20,15 +22,13 @@ config MPFR_V_2_3_1 bool prompt "2.3.1" -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! endchoice config MPFR_VERSION string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "2.4.1" if MPFR_V_2_4_1 default "2.4.0" if MPFR_V_2_4_0 default "2.3.2" if MPFR_V_2_3_2 default "2.3.1" if MPFR_V_2_3_1 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! diff --git a/config/companion_libs/ppl.in b/config/companion_libs/ppl.in index efdeabfa..8f32570b 100644 --- a/config/companion_libs/ppl.in +++ b/config/companion_libs/ppl.in @@ -3,17 +3,17 @@ choice bool prompt "PPL version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config PPL_V_0_10_2 bool prompt "0.10.2" -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! endchoice config PPL_VERSION string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "0.10.2" if PPL_V_0_10_2 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! diff --git a/config/debug/dmalloc.in b/config/debug/dmalloc.in index b643d60d..7e026d03 100644 --- a/config/debug/dmalloc.in +++ b/config/debug/dmalloc.in @@ -6,6 +6,8 @@ config DEBUG_dmalloc choice bool prompt "dmalloc version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config DMALLOC_V_5_5_2 bool @@ -16,13 +18,11 @@ config DMALLOC_V_5_4_3 prompt "5.4.3 (OBSOLETE)" depends on OBSOLETE -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! endchoice config DMALLOC_VERSION string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "5.5.2" if DMALLOC_V_5_5_2 default "5.4.3" if DMALLOC_V_5_4_3 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! diff --git a/config/debug/duma.in b/config/debug/duma.in index 7530489a..0afb5b8e 100644 --- a/config/debug/duma.in +++ b/config/debug/duma.in @@ -20,6 +20,8 @@ config 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 @@ -41,16 +43,14 @@ config DUMA_V_2_5_1 bool prompt "2_5_1" -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! 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 default "2_5_14" if DUMA_V_2_5_14 default "2_5_12" if DUMA_V_2_5_12 default "2_5_8" if DUMA_V_2_5_8 default "2_5_1" if DUMA_V_2_5_1 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 79c9cd87..b5673352 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -96,12 +96,8 @@ choice bool prompt "gdb version" depends on GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER - -config GDB_V_snapshot - bool - prompt "snapshot (EXPERIMENTAL)" - depends on EXPERIMENTAL - depends on ! GDB_CROSS_INSIGHT +# Don't remove next line +# CT_INSERT_VERSION_BELOW config GDB_V_6_8 bool @@ -131,22 +127,25 @@ config GDB_V_6_4 prompt "6.4 (OBSOLETE)" depends on OBSOLETE -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! +config GDB_V_snapshot + bool + prompt "snapshot (EXPERIMENTAL)" + depends on EXPERIMENTAL + depends on ! GDB_CROSS_INSIGHT endchoice config GDB_VERSION string - default "snapshot" if GDB_V_snapshot +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "6.8" if GDB_V_6_8 default "6.7.1" if GDB_V_6_7_1 default "6.7" if GDB_V_6_7 default "6.6" if GDB_V_6_6 default "6.5" if GDB_V_6_5 default "6.4" if GDB_V_6_4 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! + default "snapshot" if GDB_V_snapshot if GDB_NATIVE diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index 7fd6baff..58579c3b 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -11,6 +11,8 @@ config DEBUG_ltrace choice bool prompt "ltrace version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config LTRACE_V_0_5_2 bool @@ -29,15 +31,13 @@ config LTRACE_V_0_4 bool prompt "0.4" -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! endchoice config LTRACE_VERSION string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "0.5.2" if LTRACE_V_0_5_2 default "0.5.1" if LTRACE_V_0_5_1 default "0.5" if LTRACE_V_0_5 default "0.4" if LTRACE_V_0_4 -# CT_INSERT_VERSION_STRING_ABOVE -# # Don't remove above line! diff --git a/config/debug/strace.in b/config/debug/strace.in index c46d540b..4fcaa735 100644 --- a/config/debug/strace.in +++ b/config/debug/strace.in @@ -5,6 +5,8 @@ config DEBUG_strace choice bool prompt "strace version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config STRACE_V_4_5_18 bool @@ -33,17 +35,15 @@ config STRACE_V_4_5 prompt "4.5 (OBSOLETE)" depends on OBSOLETE -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! endchoice config STRACE_VERSION string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "4.5.18" if STRACE_V_4_5_18 default "4.5.17" if STRACE_V_4_5_17 default "4.5.16" if STRACE_V_4_5_16 default "4.5.15" if STRACE_V_4_5_15 default "4.5.14" if STRACE_V_4_5_14 default "4.5" if STRACE_V_4_5 -# CT_INSERT_VERSION_STRING_ABOVE -# # Don't remove above line! diff --git a/config/kernel/linux.in b/config/kernel/linux.in index f96f5893..717c1de4 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -31,6 +31,8 @@ config KERNEL_LINUX_INSTALL_CHECK choice bool prompt "Linux kernel version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config KERNEL_V_2_6_31 bool @@ -145,9 +147,6 @@ config KERNEL_V_2_6_18_8 prompt "2.6.18.8 (OBSOLETE)" depends on OBSOLETE -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! - config KERNEL_V_select bool prompt "Other version (EXPERIMENTAL)" @@ -158,6 +157,8 @@ endchoice config KERNEL_VERSION string prompt "Kernel version" if KERNEL_V_select +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "2.6.31" if KERNEL_V_2_6_31 default "2.6.30.6" if KERNEL_V_2_6_30_6 default "2.6.30.5" if KERNEL_V_2_6_30_5 @@ -184,8 +185,6 @@ config KERNEL_VERSION default "2.6.20.21" if KERNEL_V_2_6_20_21 default "2.6.19.7" if KERNEL_V_2_6_19_7 default "2.6.18.8" if KERNEL_V_2_6_18_8 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! help Enter here the kernel version you want to use, if it is not listed above. Something like V.P.S or V.P.S.E, where: diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in index c98ebd52..c507a47e 100644 --- a/config/libc/eglibc.in +++ b/config/libc/eglibc.in @@ -15,6 +15,8 @@ config LIBC_eglibc choice bool prompt "eglibc version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config LIBC_V_2_10 bool @@ -40,9 +42,6 @@ config EGLIBC_V_2_5 bool prompt "2_5" -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! - config EGLIBC_V_TRUNK bool prompt "'trunk'" @@ -53,15 +52,15 @@ endchoice config LIBC_VERSION string - default "trunk" if EGLIBC_V_TRUNK +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "2_10" if LIBC_V_2_10 default "2_9" if EGLIBC_V_2_9 default "2_8" if EGLIBC_V_2_8 default "2_7" if EGLIBC_V_2_7 default "2_6" if EGLIBC_V_2_6 default "2_5" if EGLIBC_V_2_5 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! + default "trunk" if EGLIBC_V_TRUNK config EGLIBC_REVISION string diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 310cc8f9..97d21c3e 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -11,6 +11,8 @@ config LIBC_glibc choice bool prompt "glibc version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config LIBC_V_2_9 bool @@ -47,9 +49,6 @@ config LIBC_V_2_3_6 prompt "2.3.6 (OBSOLETE)" depends on OBSOLETE -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! - config LIBC_V_LATEST bool prompt "'latest' snapshot (EXPERIMENTAL)" @@ -65,7 +64,8 @@ endchoice config LIBC_VERSION string prompt "Enter date (YYYYMMDD)" if LIBC_V_date - default "latest" if LIBC_V_LATEST +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "2.9" if LIBC_V_2_9 default "2.8" if LIBC_V_2_8 default "2.7" if LIBC_V_2_7 @@ -74,8 +74,7 @@ config LIBC_VERSION default "2.5.1" if LIBC_V_2_5_1 default "2.5" if LIBC_V_2_5 default "2.3.6" if LIBC_V_2_3_6 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! + default "latest" if LIBC_V_LATEST config LIBC_GLIBC_2_8_or_later bool diff --git a/config/libc/newlib.in b/config/libc/newlib.in index c4b9e088..e9522783 100644 --- a/config/libc/newlib.in +++ b/config/libc/newlib.in @@ -13,23 +13,21 @@ config LIBC_newlib choice bool prompt "newlib version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config NEWLIB_V_1_17_0 bool prompt "1.17.0" -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! - endchoice config LIBC_VERSION string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "1.17.0" if NEWLIB_V_1_17_0 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! - config ATMEL_AVR32_HEADERS bool prompt "Install Atmel AVR32 headers" diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index e583b765..81c3b28f 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -11,6 +11,8 @@ config LIBC_uClibc choice bool prompt "uClibc version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config LIBC_V_0_9_30_1 bool @@ -45,9 +47,6 @@ config LIBC_V_0_9_28 prompt "0.9.28 (OBSOLETE)" depends on OBSOLETE -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! - config LIBC_V_snapshot bool prompt "latest snapshot (EXPERIMENTAL)" @@ -63,7 +62,8 @@ endchoice config LIBC_VERSION string prompt "Enter date (YYYYMMDD)" if LIBC_V_specific_date - default "snapshot" if LIBC_V_snapshot +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "0.9.30.1" if LIBC_V_0_9_30_1 default "0.9.30" if LIBC_V_0_9_30 default "0.9.29" if LIBC_V_0_9_29 @@ -71,8 +71,7 @@ config LIBC_VERSION default "0.9.28.2" if LIBC_V_0_9_28_2 default "0.9.28.1" if LIBC_V_0_9_28_1 default "0.9.28" if LIBC_V_0_9_28 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! + default "snapshot" if LIBC_V_snapshot config LIBC_UCLIBC_0_9_30_or_later bool diff --git a/config/tools/libelf.in b/config/tools/libelf.in index 1513fb09..0165a394 100644 --- a/config/tools/libelf.in +++ b/config/tools/libelf.in @@ -8,6 +8,8 @@ config TOOL_libelf choice bool prompt "libelf version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW config LIBELF_V_0_8_11 bool @@ -17,13 +19,11 @@ config LIBELF_V_0_8_10 bool prompt "0.8.10" -# CT_INSERT_VERSION_ABOVE -# Don't remove above line! endchoice config LIBELF_VERSION string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW default "0.8.11" if LIBELF_V_0_8_11 default "0.8.10" if LIBELF_V_0_8_10 -# CT_INSERT_VERSION_STRING_ABOVE -# Don't remove above line! diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 255b8fe5..c2265218 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -78,34 +78,34 @@ addToolVersion() { case "${EXP},${OBS}" in ,) ;; ,*) exp_obs_prompt=" (OBSOLETE)" - deps=" depends on OBSOLETE\n" + deps=" depends on OBSOLETE" ;; *,) exp_obs_prompt=" (EXPERIMENTAL)" - deps=" depends on EXPERIMENTAL\n" + deps=" depends on EXPERIMENTAL" ;; *) exp_obs_prompt=" (EXPERIMENTAL, OBSOLETE)" - deps=" depends on EXPERIMENTAL && OBSOLETE\n" + deps=" depends on EXPERIMENTAL \\&\\& OBSOLETE" ;; esac [ -n "${exp_obs_prompt}" ] && SedExpr1="${SedExpr1}${exp_obs_prompt}" - SedExpr1="${SedExpr1}\"\n" - [ -n "${deps}" ] && SedExpr1="${SedExpr1}${deps}" + SedExpr1="${SedExpr1}\"" + [ -n "${deps}" ] && SedExpr1="${SedExpr1}\n${deps}" if [ "${tool}" = "gcc" ]; then # Extract 'M'ajor and 'm'inor from version string ver_M=$(echo "${version}...." |cut -d . -f 1) ver_m=$(echo "${version}...." |cut -d . -f 2) if [ ${ver_M} -gt 4 \ -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then - SedExpr1="${SedExpr1} select CC_GCC_4_3_or_later\n" + SedExpr1="${SedExpr1}\n select CC_GCC_4_3_or_later" fi if [ ${ver_M} -gt 4 \ -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 4 \) ]; then - SedExpr1="${SedExpr1} select CC_GCC_4_4_or_later\n" + SedExpr1="${SedExpr1}\n select CC_GCC_4_4_or_later" fi fi SedExpr2=" default \"${version}\" if ${cat}_V_${v}" - "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${SedExpr1}"'\n\1/;' "${file}" - "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${SedExpr2}"'\n\1/;' "${file}" + "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_BELOW)$/\1\n'"${SedExpr1}"'/;' "${file}" + "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_STRING_BELOW)$/\1\n'"${SedExpr2}"'/;' "${file}" } cat= -- cgit v1.2.3 From b6568d675b4da948cc9b965d88203f8f52bd05c9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 13 Sep 2009 18:44:17 +0200 Subject: config: fix indentation for options marked EXPERIMENTAL or OBSOLETE Change the 2-space separation into a 1-space separation, for the sake of homogeneity. --- config/binutils/binutils.in | 4 ++-- config/cc/gcc.in | 2 +- config/debug/ltrace.in | 2 +- scripts/addToolVersion.sh | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'config') diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index 904dad2e..9d506b5d 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -13,12 +13,12 @@ choice config BINUTILS_V_2_19_51_0_2 bool - prompt "2.19.51.0.2 (EXPERIMENTAL)" + prompt "2.19.51.0.2 (EXPERIMENTAL)" depends on EXPERIMENTAL config BINUTILS_V_2_19_51_0_1 bool - prompt "2.19.51.0.1 (EXPERIMENTAL)" + prompt "2.19.51.0.1 (EXPERIMENTAL)" depends on EXPERIMENTAL config BINUTILS_V_2_19_50_0_1 diff --git a/config/cc/gcc.in b/config/cc/gcc.in index d0ff4ab7..d4792723 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -21,7 +21,7 @@ choice config CC_V_4_4_1 bool - prompt "4.4.1 (EXPERIMENTAL)" + prompt "4.4.1 (EXPERIMENTAL)" depends on EXPERIMENTAL select CC_GCC_4_3_or_later select CC_GCC_4_4_or_later diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index 58579c3b..50d365d1 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -20,7 +20,7 @@ config LTRACE_V_0_5_2 config LTRACE_V_0_5_1 bool - prompt "0.5.1 (EXPERIMENTAL)" + prompt "0.5.1 (EXPERIMENTAL)" depends on EXPERIMENTAL config LTRACE_V_0_5 diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index c2265218..a4d7343a 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -77,13 +77,13 @@ addToolVersion() { SedExpr1="${SedExpr1} prompt \"${version}" case "${EXP},${OBS}" in ,) ;; - ,*) exp_obs_prompt=" (OBSOLETE)" + ,*) exp_obs_prompt=" (OBSOLETE)" deps=" depends on OBSOLETE" ;; - *,) exp_obs_prompt=" (EXPERIMENTAL)" + *,) exp_obs_prompt=" (EXPERIMENTAL)" deps=" depends on EXPERIMENTAL" ;; - *) exp_obs_prompt=" (EXPERIMENTAL, OBSOLETE)" + *) exp_obs_prompt=" (EXPERIMENTAL, OBSOLETE)" deps=" depends on EXPERIMENTAL \\&\\& OBSOLETE" ;; esac -- cgit v1.2.3 From 464dc74aa50731d520fb408dbf631fbe2425cdae Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 26 Sep 2009 12:46:41 +0200 Subject: kernel/linux: update versions. --- config/kernel/linux.in | 50 ++++++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) (limited to 'config') diff --git a/config/kernel/linux.in b/config/kernel/linux.in index 717c1de4..34c54225 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -34,10 +34,22 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW +config KERNEL_V_2_6_31_1 + bool + prompt "2.6.31.1" + config KERNEL_V_2_6_31 bool prompt "2.6.31" +config KERNEL_V_3_6_30_8 + bool + prompt "3.6.30.8" + +config KERNEL_V_3_6_30_7 + bool + prompt "3.6.30.7" + config KERNEL_V_2_6_30_6 bool prompt "2.6.30.6" @@ -70,37 +82,13 @@ config KERNEL_V_2_6_29_6 bool prompt "2.6.29.6" -config KERNEL_V_2_6_29_5 - bool - prompt "2.6.29.5" - -config KERNEL_V_2_6_29_4 - bool - prompt "2.6.29.4" - -config KERNEL_V_2_6_29_3 - bool - prompt "2.6.29.3" - -config KERNEL_V_2_6_29_2 - bool - prompt "2.6.29.2" - -config KERNEL_V_2_6_29_1 - bool - prompt "2.6.29.1" - -config KERNEL_V_2_6_29 - bool - prompt "2.6.29" - config KERNEL_V_2_6_28_10 bool prompt "2.6.28.10" -config KERNEL_V_2_6_27_33 +config KERNEL_V_2_6_27_35 bool - prompt "2.6.27.33 (long-term stable)" + prompt "2.6.27.35 (long-term stable)" config KERNEL_V_2_6_26_8 bool @@ -159,7 +147,10 @@ config KERNEL_VERSION prompt "Kernel version" if KERNEL_V_select # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW + default "2.6.31.1" if KERNEL_V_2_6_31_1 default "2.6.31" if KERNEL_V_2_6_31 + default "3.6.30.8" if KERNEL_V_3_6_30_8 + default "3.6.30.7" if KERNEL_V_3_6_30_7 default "2.6.30.6" if KERNEL_V_2_6_30_6 default "2.6.30.5" if KERNEL_V_2_6_30_5 default "2.6.30.4" if KERNEL_V_2_6_30_4 @@ -168,14 +159,9 @@ config KERNEL_VERSION default "2.6.30.1" if KERNEL_V_2_6_30_1 default "2.6.30" if KERNEL_V_2_6_30 default "2.6.29.6" if KERNEL_V_2_6_29_6 - default "2.6.29.5" if KERNEL_V_2_6_29_5 - default "2.6.29.4" if KERNEL_V_2_6_29_4 - default "2.6.29.3" if KERNEL_V_2_6_29_3 - default "2.6.29.2" if KERNEL_V_2_6_29_2 - default "2.6.29.1" if KERNEL_V_2_6_29_1 default "2.6.29" if KERNEL_V_2_6_29 default "2.6.28.10" if KERNEL_V_2_6_28_10 - default "2.6.27.33" if KERNEL_V_2_6_27_33 + default "2.6.27.35" if KERNEL_V_2_6_27_35 default "2.6.26.8" if KERNEL_V_2_6_26_8 default "2.6.25.20" if KERNEL_V_2_6_25_20 default "2.6.24.7" if KERNEL_V_2_6_24_7 -- cgit v1.2.3 From b586e9ce7214b85e875ca608ea4bd7db1c4fe4e2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Fri, 2 Oct 2009 00:04:24 +0200 Subject: libc/glibc: remove dead code The option to retrieve snapshots is already handled by the generic 'specific date' and 'use latest' entries. No need for a special case, as there's no code for it. --- config/libc/glibc.in | 10 ---------- scripts/build/libc/glibc.sh | 2 -- 2 files changed, 12 deletions(-) (limited to 'config') diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 97d21c3e..3da40753 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -128,14 +128,4 @@ config LIBC_GLIBC_CVS_date endif # LIBC_GLIBC_CVS -#config LIBC_GLIBC_SNAPSHOT -# bool -# prompt "Use latest nightly snapshot" -# help -# See the help for the entry "Released tarball", above. -# -# If you can live with a moving code-base, say 'Y' here. -# If you want your toolchain to really be reproducible, look at the -# choice entry "Released tarball from FTP", above. - endchoice diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index a83fb253..2573da68 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -47,8 +47,6 @@ do_libc_get() { "glibc-${version}-branch${date:+:}${date}" \ "glibc-${addon}-cvs-${CT_LIBC_VERSION}" done -# elif [ "${CT_LIBC_GLIBC_SNAPSHOT}" = "y" ]; then -# : # Not yet handled... fi return 0 -- cgit v1.2.3 From d0c5d174bf933509d09656f050941bc465e25357 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 3 Oct 2009 18:19:39 +0200 Subject: libc/glibc: don't use legacy snapshots glibc snapshots have not been updated for about the past 5 months. Consider them to be deprecated, now. --- config/libc/glibc.in | 12 ------------ scripts/build/libc/glibc.sh | 12 ------------ 2 files changed, 24 deletions(-) (limited to 'config') diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 3da40753..777657c2 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -49,21 +49,10 @@ config LIBC_V_2_3_6 prompt "2.3.6 (OBSOLETE)" depends on OBSOLETE -config LIBC_V_LATEST - bool - prompt "'latest' snapshot (EXPERIMENTAL)" - depends on EXPERIMENTAL - -config LIBC_V_date - bool - prompt " (EXPERIMENTAL)" - depends on EXPERIMENTAL - endchoice config LIBC_VERSION string - prompt "Enter date (YYYYMMDD)" if LIBC_V_date # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW default "2.9" if LIBC_V_2_9 @@ -74,7 +63,6 @@ config LIBC_VERSION default "2.5.1" if LIBC_V_2_5_1 default "2.5" if LIBC_V_2_5 default "2.3.6" if LIBC_V_2_3_6 - default "latest" if LIBC_V_LATEST config LIBC_GLIBC_2_8_or_later bool diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 2573da68..8476bf8c 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -292,12 +292,6 @@ do_libc_start_files() { # Add some default CC args glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/') glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/') - # In case we're using a snapshot, fake a >=2.6 version. - if [ "${CT_LIBC_V_LATEST}" = "y" \ - -o "${CT_LIBC_V_date}" = "y" ]; then - glibc_version_major=3 - glibc_version_minor=0 - fi if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \ -o ${glibc_version_major} -gt 2 ]; then # Don't use -pipe: configure chokes on it for glibc >= 2.6. @@ -407,12 +401,6 @@ do_libc() { # Add some default CC args glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/') glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/') - # In case we're using a snapshot, fake a >=2.6 version. - if [ "${CT_LIBC_V_LATEST}" = "y" \ - -o "${CT_LIBC_V_date}" = "y" ]; then - glibc_version_major=3 - glibc_version_minor=0 - fi if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \ -o ${glibc_version_major} -gt 2 ]; then # Don't use -pipe: configure chokes on it for glibc >= 2.6. -- cgit v1.2.3