diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/addToolVersion.sh | 3 | ||||
| -rw-r--r-- | scripts/build/debug/400-ltrace.sh | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 1ac9517f..bf592323 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -18,7 +18,7 @@ doHelp() { 'tool' in one of: gcc, binutils, glibc, uClibc, uClibc-ng, newlib, linux, gdb, duma, strace, ltrace, libelf, gmp, mpfr, isl, cloog, mpc, - mingw-w64, expat, ncurses, musl + mingw-w64, expat, ncurses, musl, gettext Valid options for all tools: --stable, -s, +x (default) @@ -209,6 +209,7 @@ while [ $# -gt 0 ]; do --libelf) EXP=; OBS=; cat=LIBELF; tool=libelf; tool_prefix=companion_libs; dot2suffix=;; --expat) EXP=; OBS=; cat=EXPAT; tool=expat; tool_prefix=companion_libs; dot2suffix=;; --ncurses) EXP=; OBS=; cat=NCURSES; tool=ncurses; tool_prefix=companion_libs; dot2suffix=;; + --gettext) EXP=; OBS=; cat=GETTEXT; tool=gettext; tool_prefix=companion_libs; dot2suffix=;; --make) EXP=; OBS=; cat=MAKE; tool=make; tool_prefix=companion_tools; dot2suffix=;; --m4) EXP=; OBS=; cat=M4; tool=m4; tool_prefix=companion_tools; dot2suffix=;; --autoconf) EXP=; OBS=; cat=AUTOCONF; tool=autoconf; tool_prefix=companion_tools; dot2suffix=;; 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";; |