From 23aef79883b1f4d0e009c9b3cf24cc8fd62b84f1 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 22 Jan 2017 15:50:18 -0800 Subject: Declare older versions obsolete. Signed-off-by: Alexey Neyman --- config/debug/gdb.in | 55 +++++++++++++++++++++++++------------------------- config/debug/ltrace.in | 7 +++++-- config/debug/strace.in | 3 ++- 3 files changed, 35 insertions(+), 30 deletions(-) (limited to 'config/debug') diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 6ef0640f..0bf17403 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -79,170 +79,171 @@ config GDB_V_7_11 config GDB_V_7_10_1 bool - prompt "7.10.1" + prompt "7.10.1 (OBSOLETE)" select GDB_7_2_or_later + depends on OBSOLETE config GDB_V_7_10 bool - prompt "7.10" + prompt "7.10 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_9_1 bool - prompt "7.9.1" + prompt "7.9.1 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_9 bool - prompt "7.9" + prompt "7.9 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_linaro_7_8 bool - prompt "linaro-7.8-2014.09" + prompt "linaro-7.8-2014.09 (OBSOLETE)" depends on DEBUG_GDB_SHOW_LINARO depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_8_2 bool - prompt "7.8.2" + prompt "7.8.2 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_8_1 bool - prompt "7.8.1" + prompt "7.8.1 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_8 bool - prompt "7.8" + prompt "7.8 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_linaro_7_7_1 bool - prompt "linaro-7.7.1-2014.06" + prompt "linaro-7.7.1-2014.06 (OBSOLETE)" depends on DEBUG_GDB_SHOW_LINARO depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_7_1 bool - prompt "7.7.1" + prompt "7.7.1 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_linaro_7_7 bool - prompt "linaro-7.7-2014.05" + prompt "linaro-7.7-2014.05 (OBSOLETE)" depends on DEBUG_GDB_SHOW_LINARO depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_7 bool - prompt "7.7" + prompt "7.7 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_linaro_7_6 bool - prompt "linaro-7.6.1-2013.10" + prompt "linaro-7.6.1-2013.10 (OBSOLETE)" depends on DEBUG_GDB_SHOW_LINARO select GDB_7_2_or_later config GDB_V_7_6_1 bool - prompt "7.6.1" + prompt "7.6.1 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_linaro_7_5 bool - prompt "linaro-7.5-2012.12" + prompt "linaro-7.5-2012.12 (OBSOLETE)" depends on DEBUG_GDB_SHOW_LINARO depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_5_1 bool - prompt "7.5.1" + prompt "7.5.1 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_linaro_7_4 bool - prompt "linaro-7.4-2012.06" + prompt "linaro-7.4-2012.06 (OBSOLETE)" depends on DEBUG_GDB_SHOW_LINARO depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_4_1 bool - prompt "7.4.1" + prompt "7.4.1 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_4 bool - prompt "7.4" + prompt "7.4 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_linaro_7_3 bool - prompt "linaro-7.3-2011.12" + prompt "linaro-7.3-2011.12 (OBSOLETE)" depends on DEBUG_GDB_SHOW_LINARO depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_3_1 bool - prompt "7.3.1" + prompt "7.3.1 (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_3a bool - prompt "7.3a" + prompt "7.3a (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_2a bool - prompt "7.2a" + prompt "7.2a (OBSOLETE)" depends on OBSOLETE select GDB_7_2_or_later config GDB_V_7_1a bool - prompt "7.1a" + prompt "7.1a (OBSOLETE)" depends on OBSOLETE select GDB_7_0_or_later config GDB_V_7_0_1a bool - prompt "7.0.1a" + prompt "7.0.1a (OBSOLETE)" depends on OBSOLETE select GDB_7_0_or_later config GDB_V_7_0a bool - prompt "7.0a" + prompt "7.0a (OBSOLETE)" depends on OBSOLETE select GDB_7_0_or_later config GDB_V_6_8a bool + prompt "6.8a (OBSOLETE)" depends on OBSOLETE - prompt "6.8a" endchoice diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index aa5c0580..b506461c 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -18,15 +18,18 @@ choice config LTRACE_V_0_7_3 bool prompt "0.7.3" + select LTRACE_0_5_3_or_later config LTRACE_V_0_5_3 bool - prompt "0.5.3" + prompt "0.5.3 (OBSOLETE)" select LTRACE_0_5_3_or_later + depends on OBSOLETE config LTRACE_V_0_5_2 bool - prompt "0.5.2" + prompt "0.5.2 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/debug/strace.in b/config/debug/strace.in index a225878e..48eab0e8 100644 --- a/config/debug/strace.in +++ b/config/debug/strace.in @@ -15,7 +15,8 @@ config STRACE_V_4_15 config STRACE_V_4_14 bool - prompt "4.14" + prompt "4.14 (OBSOLETE)" + depends on OBSOLETE depends on CONFIGURE_has_xz config STRACE_V_4_13 -- cgit v1.2.3 From 3fc7c1ef69eba2a0f9bd108492a8b3ed4d42347c Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 23 Jan 2017 12:29:44 -0800 Subject: Fix handling of ltrace 0.5.3 peculiarity. Also, remove 0.5.2 selection - no longer available for download. Signed-off-by: Alexey Neyman --- config/debug/ltrace.in | 14 +++++--------- scripts/build/debug/400-ltrace.sh | 5 +++-- 2 files changed, 8 insertions(+), 11 deletions(-) (limited to 'config/debug') diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index b506461c..fc5822d2 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -18,18 +18,12 @@ choice config LTRACE_V_0_7_3 bool prompt "0.7.3" - select LTRACE_0_5_3_or_later config LTRACE_V_0_5_3 bool prompt "0.5.3 (OBSOLETE)" - select LTRACE_0_5_3_or_later - depends on OBSOLETE - -config LTRACE_V_0_5_2 - bool - prompt "0.5.2 (OBSOLETE)" depends on OBSOLETE + select LTRACE_0_5_3_CONFIGURE endchoice @@ -39,7 +33,9 @@ config LTRACE_VERSION # CT_INSERT_VERSION_STRING_BELOW default "0.7.3" if LTRACE_V_0_7_3 default "0.5.3" if LTRACE_V_0_5_3 - default "0.5.2" if LTRACE_V_0_5_2 -config LTRACE_0_5_3_or_later +# Ltrace 0.5.3 had a unique hand-crafted configure script that has to be +# run differently from any preceding or following releases. This serves +# as a reminder to remove that code once 0.5.3 support is dropped. +config LTRACE_0_5_3_CONFIGURE bool diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh index 2926876b..6b860e92 100644 --- a/scripts/build/debug/400-ltrace.sh +++ b/scripts/build/debug/400-ltrace.sh @@ -27,8 +27,9 @@ do_debug_ltrace_build() { CT_Pushd "${CT_BUILD_DIR}/build-ltrace" CT_DoLog EXTRA "Configuring ltrace" - # ltrace-0.5.3, and later, don't use GNU Autotools configure script anymore - if [ "${CT_LTRACE_0_5_3_or_later}" = "y" ]; then + # ltrace-0.5.3 has a unique hand-crafted configure script. Releases + # 0.5.2 and earlier as well as 0.6.0 and later use GNU autotools. + if [ "${LTRACE_0_5_3_CONFIGURE}" = "y" ]; then case "${CT_ARCH}:${CT_ARCH_BITNESS}" in x86:32) ltrace_host="i386";; x86:64) ltrace_host="x86_64";; -- cgit v1.2.3