Fix handling of ltrace 0.5.3 peculiarity.

Also, remove 0.5.2 selection - no longer available for download.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2017-01-23 12:29:44 -08:00
parent 42c9f031dd
commit 3fc7c1ef69
2 changed files with 8 additions and 11 deletions

View File

@ -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

View File

@ -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";;