summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/binutils/binutils.in8
-rw-r--r--config/binutils/elf2flt.in8
-rw-r--r--config/cc/gcc.in8
-rw-r--r--config/companion_libs/cloog.in8
-rw-r--r--config/companion_libs/gmp.in8
-rw-r--r--config/companion_libs/mpc.in8
-rw-r--r--config/companion_libs/mpfr.in8
-rw-r--r--config/companion_libs/ppl.in8
-rw-r--r--config/debug/dmalloc.in8
-rw-r--r--config/debug/duma.in8
-rw-r--r--config/debug/gdb.in21
-rw-r--r--config/debug/ltrace.in8
-rw-r--r--config/debug/strace.in8
-rw-r--r--config/kernel/linux.in9
-rw-r--r--config/libc/eglibc.in11
-rw-r--r--config/libc/glibc.in11
-rw-r--r--config/libc/newlib.in10
-rw-r--r--config/libc/uClibc.in11
-rw-r--r--config/tools/libelf.in8
-rwxr-xr-xscripts/addToolVersion.sh18
20 files changed, 94 insertions, 101 deletions
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index c39e518..904dad2 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 0b1ef72..c46e599 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 39043a7..d0ff4ab 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 7ae6f87..75ddb14 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 5a8c78c..75628d9 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 42d5a6f..27e9b90 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 365cd4f..61f057a 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 efdeabf..8f32570 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 b643d60..7e026d0 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 7530489..0afb5b8 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 79c9cd8..b567335 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 7fd6baf..58579c3 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 c46d540..4fcaa73 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 f96f589..717c1de 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 c98ebd5..c507a47 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 310cc8f..97d21c3 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 c4b9e08..e952278 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 e583b76..81c3b28 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 1513fb0..0165a39 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 255b8fe..c226521 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=
generated by cgit v0.10.2-6-g49f6 at 2024-04-19 18:22:51 (GMT)