diff options
25 files changed, 520 insertions, 117 deletions
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index 07d4a90..e66c972 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -72,36 +72,42 @@ config BINUTILS_V_2_26 config BINUTILS_V_2_25_1 bool - prompt "2.25.1" + prompt "2.25.1 (OBSOLETE)" select BINUTILS_2_25_1_or_later + depends on OBSOLETE config BINUTILS_LINARO_V_2_25 bool - prompt "linaro-2.25.0-2015.01-2" + prompt "linaro-2.25.0-2015.01-2 (OBSOLETE)" select BINUTILS_2_25_or_later depends on BINUTILS_SHOW_LINARO + depends on OBSOLETE config BINUTILS_LINARO_V_2_24 bool - prompt "linaro-2.24.0-2014.11-2" + prompt "linaro-2.24.0-2014.11-2 (OBSOLETE)" select BINUTILS_2_24_or_later depends on BINUTILS_SHOW_LINARO + depends on OBSOLETE config BINUTILS_V_2_24 bool - prompt "2.24" + prompt "2.24 (OBSOLETE)" select BINUTILS_2_24_or_later + depends on OBSOLETE config BINUTILS_LINARO_V_2_23_2 bool - prompt "linaro-2.23.2-2013.10-4" + prompt "linaro-2.23.2-2013.10-4 (OBSOLETE)" select BINUTILS_2_23_2_or_later depends on BINUTILS_SHOW_LINARO + depends on OBSOLETE config BINUTILS_V_2_23_2 bool - prompt "2.23.2" + prompt "2.23.2 (OBSOLETE)" select BINUTILS_2_23_2_or_later + depends on OBSOLETE endchoice diff --git a/config/cc/gcc.in b/config/cc/gcc.in index e0c4875..c1996e9 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -90,31 +90,36 @@ config CC_GCC_V_5_4_0 config CC_GCC_V_linaro_5_3 bool - prompt "linaro-5.3-2016.05" + prompt "linaro-5.3-2016.05 (OBSOLETE)" depends on CC_GCC_SHOW_LINARO + depends on OBSOLETE select CC_GCC_5 config CC_GCC_V_linaro_4_9 bool - prompt "linaro-4.9-2016.02" + prompt "linaro-4.9-2016.02 (OBSOLETE)" depends on CC_GCC_SHOW_LINARO + depends on OBSOLETE select CC_GCC_4_9 config CC_GCC_V_4_9_4 bool - prompt "4.9.4" + prompt "4.9.4 (OBSOLETE)" + depends on OBSOLETE select CC_GCC_4_9 config CC_GCC_V_linaro_4_8 bool - prompt "linaro-4.8-2015.06" + prompt "linaro-4.8-2015.06 (OBSOLETE)" depends on CC_GCC_SHOW_LINARO + depends on OBSOLETE select CC_GCC_4_8 config CC_GCC_V_4_8_5 bool - prompt "4.8.5" + prompt "4.8.5 (OBSOLETE)" select CC_GCC_4_8 + depends on OBSOLETE endchoice diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in index d6e129d..f094fa3 100644 --- a/config/companion_libs/cloog.in +++ b/config/companion_libs/cloog.in @@ -1,4 +1,5 @@ # CLooG options +## depends on OBSOLETE # CLooG 0.18.4 requires ISL 0.12 or newer # CLooG 0.18.1/0.18.0 frequires ISL 0.12 or older @@ -11,20 +12,23 @@ choice config CLOOG_V_0_18_4 bool - prompt "0.18.4" + prompt "0.18.4 (OBSOLETE)" depends on ISL_V_0_12_or_later + depends on OBSOLETE select CLOOG_0_18_4_or_later config CLOOG_V_0_18_1 bool - prompt "0.18.1" + prompt "0.18.1 (OBSOLETE)" depends on !ISL_V_0_14_or_later + depends on OBSOLETE select CLOOG_0_18_or_later config CLOOG_V_0_18_0 bool - prompt "0.18.0" + prompt "0.18.0 (OBSOLETE)" depends on !ISL_V_0_14_or_later + depends on OBSOLETE select CLOOG_0_18_or_later endchoice diff --git a/config/companion_libs/expat.in b/config/companion_libs/expat.in index 3f2ebd2..40ad66c 100644 --- a/config/companion_libs/expat.in +++ b/config/companion_libs/expat.in @@ -12,7 +12,8 @@ config EXPAT_V_2_2_0 config EXPAT_V_2_1_1 bool - prompt "2.1.1" + prompt "2.1.1 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/companion_libs/gettext.in b/config/companion_libs/gettext.in index 3a46b58..d76955a 100644 --- a/config/companion_libs/gettext.in +++ b/config/companion_libs/gettext.in @@ -6,9 +6,14 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW +config GETTEXT_V_0_19_8_1 + bool + prompt "0.19.8.1" + config GETTEXT_V_0_19_7 bool - prompt "0.19.7" + prompt "0.19.7 (OBSOLETE)" + depends on OBSOLETE endchoice @@ -16,4 +21,5 @@ config GETTEXT_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW + default "0.19.8.1" if GETTEXT_V_0_19_8_1 default "0.19.7" if GETTEXT_V_0_19_7 diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in index b92050d..167c772 100644 --- a/config/companion_libs/gmp.in +++ b/config/companion_libs/gmp.in @@ -13,44 +13,53 @@ config GMP_V_6_1_2 config GMP_V_6_1_0 bool - prompt "6.1.0" + prompt "6.1.0 (OBSOLETE)" select GMP_5_0_2_or_later + depends on OBSOLETE config GMP_V_6_0_0 bool - prompt "6.0.0a" + prompt "6.0.0a (OBSOLETE)" select GMP_5_0_2_or_later + depends on OBSOLETE config GMP_V_5_1_3 bool - prompt "5.1.3" + prompt "5.1.3 (OBSOLETE)" select GMP_5_0_2_or_later + depends on OBSOLETE config GMP_V_5_1_1 bool - prompt "5.1.1" + prompt "5.1.1 (OBSOLETE)" select GMP_5_0_2_or_later + depends on OBSOLETE config GMP_V_5_0_2 bool - prompt "5.0.2" + prompt "5.0.2 (OBSOLETE)" select GMP_5_0_2_or_later + depends on OBSOLETE config GMP_V_5_0_1 bool - prompt "5.0.1" + prompt "5.0.1 (OBSOLETE)" + depends on OBSOLETE config GMP_V_4_3_2 bool - prompt "4.3.2" + prompt "4.3.2 (OBSOLETE)" + depends on OBSOLETE config GMP_V_4_3_1 bool - prompt "4.3.1" + prompt "4.3.1 (OBSOLETE)" + depends on OBSOLETE config GMP_V_4_3_0 bool - prompt "4.3.0" + prompt "4.3.0 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/companion_libs/isl.in b/config/companion_libs/isl.in index 66db376..6ba9e07 100644 --- a/config/companion_libs/isl.in +++ b/config/companion_libs/isl.in @@ -39,25 +39,29 @@ config ISL_V_0_16_1 # mainline 4.9 release (4.9.4) does. config ISL_V_0_15 bool - prompt "0.15" + prompt "0.15 (OBSOLETE)" depends on CC_GCC_4_9_or_later && !CC_GCC_V_linaro_4_9 select ISL_V_0_15_or_later + depends on OBSOLETE config ISL_V_0_14 bool - prompt "0.14" + prompt "0.14 (OBSOLETE)" select ISL_V_0_14_or_later + depends on OBSOLETE config ISL_V_0_12_2 bool - prompt "0.12.2" + prompt "0.12.2 (OBSOLETE)" depends on !CC_GCC_6_or_later select ISL_V_0_12_or_later + depends on OBSOLETE config ISL_V_0_11_1 bool - prompt "0.11.1" + prompt "0.11.1 (OBSOLETE)" depends on !CC_GCC_4_9_or_later + depends on OBSOLETE endchoice diff --git a/config/companion_libs/libelf.in b/config/companion_libs/libelf.in index 64eff12..b01ab36 100644 --- a/config/companion_libs/libelf.in +++ b/config/companion_libs/libelf.in @@ -12,7 +12,8 @@ config LIBELF_V_0_8_13 config LIBELF_V_0_8_12 bool - prompt "0.8.12" + prompt "0.8.12 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in index 6d22a33..cd8132d 100644 --- a/config/companion_libs/mpc.in +++ b/config/companion_libs/mpc.in @@ -12,31 +12,38 @@ config MPC_V_1_0_3 config MPC_V_1_0_2 bool - prompt "1.0.2" + prompt "1.0.2 (OBSOLETE)" + depends on OBSOLETE config MPC_V_1_0_1 bool - prompt "1.0.1" + prompt "1.0.1 (OBSOLETE)" + depends on OBSOLETE config MPC_V_1_0 bool - prompt "1.0" + prompt "1.0 (OBSOLETE)" + depends on OBSOLETE config MPC_V_0_9 bool - prompt "0.9" + prompt "0.9 (OBSOLETE)" + depends on OBSOLETE config MPC_V_0_8_2 bool - prompt "0.8.2" + prompt "0.8.2 (OBSOLETE)" + depends on OBSOLETE config MPC_V_0_8_1 bool - prompt "0.8.1" + prompt "0.8.1 (OBSOLETE)" + depends on OBSOLETE config MPC_V_0_7 bool - prompt "0.7" + prompt "0.7 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in index 5957e23..ce33b3d 100644 --- a/config/companion_libs/mpfr.in +++ b/config/companion_libs/mpfr.in @@ -12,35 +12,43 @@ config MPFR_V_3_1_5 config MPFR_V_3_1_3 bool - prompt "3.1.3" + prompt "3.1.3 (OBSOLETE)" + depends on OBSOLETE config MPFR_V_3_1_2 bool - prompt "3.1.2" + prompt "3.1.2 (OBSOLETE)" + depends on OBSOLETE config MPFR_V_3_1_0 bool - prompt "3.1.0" + prompt "3.1.0 (OBSOLETE)" + depends on OBSOLETE config MPFR_V_3_0_1 bool - prompt "3.0.1" + prompt "3.0.1 (OBSOLETE)" + depends on OBSOLETE config MPFR_V_3_0_0 bool - prompt "3.0.0" + prompt "3.0.0 (OBSOLETE)" + depends on OBSOLETE config MPFR_V_2_4_2 bool - prompt "2.4.2" + prompt "2.4.2 (OBSOLETE)" + depends on OBSOLETE config MPFR_V_2_4_1 bool - prompt "2.4.1" + prompt "2.4.1 (OBSOLETE)" + depends on OBSOLETE config MPFR_V_2_4_0 bool - prompt "2.4.0" + prompt "2.4.0 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/companion_tools/automake.in b/config/companion_tools/automake.in index 500ae14..781a44a 100644 --- a/config/companion_tools/automake.in +++ b/config/companion_tools/automake.in @@ -14,15 +14,18 @@ config AUTOMAKE_V_1_15 config AUTOMAKE_V_1_14 bool - prompt "1.14" + prompt "1.14 (OBSOLETE)" + depends on OBSOLETE config AUTOMAKE_V_1_11_6 bool - prompt "1.11.6" + prompt "1.11.6 (OBSOLETE)" + depends on OBSOLETE config AUTOMAKE_V_1_11_1 bool - prompt "1.11.1" + prompt "1.11.1 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/companion_tools/m4.in b/config/companion_tools/m4.in index b99a466..a09e9fa 100644 --- a/config/companion_tools/m4.in +++ b/config/companion_tools/m4.in @@ -8,13 +8,19 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW +config M4_V_1_4_18 + bool + prompt "1.4.18" + config M4_V_1_4_17 bool - prompt "1.4.17" + prompt "1.4.17 (OBSOLETE)" + depends on OBSOLETE config M4_V_1_4_13 bool - prompt "1.4.13" + prompt "1.4.13 (OBSOLETE)" + depends on OBSOLETE endchoice @@ -22,5 +28,6 @@ config M4_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW + default "1.4.18" if M4_V_1_4_18 default "1.4.17" if M4_V_1_4_17 default "1.4.13" if M4_V_1_4_13 diff --git a/config/companion_tools/make.in b/config/companion_tools/make.in index 0935cd8..e9e7997 100644 --- a/config/companion_tools/make.in +++ b/config/companion_tools/make.in @@ -14,15 +14,18 @@ config MAKE_V_4_2_1 config MAKE_V_4_1 bool - prompt "4.1" + prompt "4.1 (OBSOLETE)" + depends on OBSOLETE config MAKE_V_4_0 bool - prompt "4.0" + prompt "4.0 (OBSOLETE)" + depends on OBSOLETE config MAKE_V_3_81 bool - prompt "3.81" + prompt "3.81 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 6ef0640..0bf1740 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 aa5c058..fc5822d 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -21,12 +21,9 @@ config LTRACE_V_0_7_3 config LTRACE_V_0_5_3 bool - prompt "0.5.3" - select LTRACE_0_5_3_or_later - -config LTRACE_V_0_5_2 - bool - prompt "0.5.2" + prompt "0.5.3 (OBSOLETE)" + depends on OBSOLETE + select LTRACE_0_5_3_CONFIGURE endchoice @@ -36,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/config/debug/strace.in b/config/debug/strace.in index a225878..48eab0e 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 diff --git a/config/kernel/linux.in b/config/kernel/linux.in index 829e7b0..56756e7 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -44,34 +44,34 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW -config KERNEL_V_4_8 +config KERNEL_V_4_9 bool - prompt "4.8.8" + prompt "4.9.5" -config KERNEL_V_4_7 +config KERNEL_V_4_8 bool - prompt "4.7.10 (EOL)" + prompt "4.8.17 (EOL)" depends on OBSOLETE config KERNEL_V_4_4 bool - prompt "4.4.32" + prompt "4.4.44" config KERNEL_V_4_1 bool - prompt "4.1.35" + prompt "4.1.38" config KERNEL_V_3_18 bool - prompt "3.18.44" + prompt "3.18.47" config KERNEL_V_3_16 bool - prompt "3.16.38" + prompt "3.16.39" config KERNEL_V_3_12 bool - prompt "3.12.67" + prompt "3.12.69" config KERNEL_V_3_10 bool @@ -83,7 +83,7 @@ config KERNEL_V_3_4 config KERNEL_V_3_2 bool - prompt "3.2.83" + prompt "3.2.84" endchoice @@ -91,15 +91,15 @@ config KERNEL_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW - default "4.8.8" if KERNEL_V_4_8 - default "4.7.10" if KERNEL_V_4_7 - default "4.4.32" if KERNEL_V_4_4 - default "4.1.35" if KERNEL_V_4_1 - default "3.18.44" if KERNEL_V_3_18 - default "3.16.38" if KERNEL_V_3_16 - default "3.12.67" if KERNEL_V_3_12 + default "4.9.5" if KERNEL_V_4_9 + default "4.8.17" if KERNEL_V_4_8 + default "4.4.44" if KERNEL_V_4_4 + default "4.1.38" if KERNEL_V_4_1 + default "3.18.47" if KERNEL_V_3_18 + default "3.16.39" if KERNEL_V_3_16 + default "3.12.69" if KERNEL_V_3_12 default "3.10.104" if KERNEL_V_3_10 default "3.4.113" if KERNEL_V_3_4 - default "3.2.83" if KERNEL_V_3_2 + default "3.2.84" if KERNEL_V_3_2 endif # ! KERNEL_LINUX_CUSTOM diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 3ab88e9..d6bd013 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -83,32 +83,38 @@ config LIBC_GLIBC_V_2_23 config LIBC_GLIBC_V_2_22 bool - prompt "2.22" + prompt "2.22 (OBSOLETE)" select LIBC_GLIBC_2_20_or_later + depends on OBSOLETE config LIBC_GLIBC_V_2_21 bool - prompt "2.21" + prompt "2.21 (OBSOLETE)" select LIBC_GLIBC_2_20_or_later + depends on OBSOLETE config LIBC_GLIBC_LINARO_V_2_20 bool - prompt "Linaro 2.20-2014.11" + prompt "Linaro 2.20-2014.11 (OBSOLETE)" select LIBC_GLIBC_2_20_or_later depends on CC_GLIBC_SHOW_LINARO + depends on OBSOLETE config LIBC_GLIBC_V_2_20 bool - prompt "2.20" + prompt "2.20 (OBSOLETE)" select LIBC_GLIBC_2_20_or_later + depends on OBSOLETE config LIBC_GLIBC_V_2_19 bool - prompt "2.19" + prompt "2.19 (OBSOLETE)" + depends on OBSOLETE config LIBC_GLIBC_V_2_18 bool - prompt "2.18" + prompt "2.18 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index 43457c5..d3281e2 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -88,7 +88,7 @@ config LIBC_UCLIBC_NG_V_1_0_21 config LIBC_UCLIBC_NG_V_1_0_20 bool - prompt "1.0.20" + prompt "1.0.20 (OBSOLETE)" depends on OBSOLETE select LIBC_UCLIBC_NG_1_0_15_or_later diff --git a/patches/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch b/patches/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch new file mode 100644 index 0000000..dacdfb1 --- /dev/null +++ b/patches/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch @@ -0,0 +1,31 @@ +From a76649dae62768d0af7017b3fc0ca5f891588c78 Mon Sep 17 00:00:00 2001 +From: Andoni Morales Alastruey <ylatuya@gmail.com> +Date: Wed, 29 Feb 2012 10:44:43 +0100 +Subject: [PATCH] Fix linker error: redefinition of vasprintf + +This might not be the best patch, but it works for us +The link error was: +.libs/autosprintf.o:autosprintf.cc:(.text$vasprintf[_vasprintf]+0x0): multiple definition of `_vasprintf' +.libs/lib-asprintf.o:lib-asprintf.c:(.text+0x4621): first defined here +--- + gettext-runtime/libasprintf/autosprintf.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gettext-runtime/libasprintf/autosprintf.cc b/gettext-runtime/libasprintf/autosprintf.cc +index ca318f7..2526210 100644 +--- a/gettext-runtime/libasprintf/autosprintf.cc ++++ b/gettext-runtime/libasprintf/autosprintf.cc +@@ -19,8 +19,10 @@ + This must come before <config.h> because <config.h> may include + <features.h>, and once <features.h> has been included, it's too late. */ + #ifndef _GNU_SOURCE ++#ifndef _WIN32 + # define _GNU_SOURCE 1 + #endif ++#endif + + /* Specification. */ + #include "autosprintf.h" +-- +1.8.4 + diff --git a/patches/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch b/patches/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch new file mode 100644 index 0000000..8c6b94f --- /dev/null +++ b/patches/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch @@ -0,0 +1,199 @@ +From d4ecf6f15ad7a428786df2efdc88b03be0a4fdbb Mon Sep 17 00:00:00 2001 +From: Daiki Ueno <ueno@gnu.org> +Date: Thu, 17 Jan 2013 18:33:40 +0900 +Subject: [PATCH] Fix Woe32 link errors when compiling with -O0. + +--- + gettext-tools/src/Makefile.am | 24 ++++++++++++++++++++++-- + gettext-tools/src/color.c | 1 + + gettext-tools/woe32dll/c++color.cc | 1 + + gettext-tools/woe32dll/c++file-ostream.cc | 2 ++ + gettext-tools/woe32dll/c++html-ostream.cc | 1 + + gettext-tools/woe32dll/c++styled-ostream.cc | 1 + + gettext-tools/woe32dll/c++term-ostream.cc | 1 + + gettext-tools/woe32dll/c++write-catalog.cc | 1 + + gettext-tools/woe32dll/c++write-po.cc | 1 + + gettext-tools/woe32dll/c++write-properties.cc | 1 + + gettext-tools/woe32dll/c++write-stringtable.cc | 1 + + gnulib-local/modules/file-ostream | 4 ++++ + gnulib-local/modules/html-ostream | 4 ++++ + gnulib-local/modules/ostream | 4 ++++ + gnulib-local/modules/styled-ostream | 4 ++++ + gnulib-local/modules/term-ostream | 4 ++++ + 16 files changed, 53 insertions(+), 2 deletions(-) + create mode 100644 gettext-tools/woe32dll/c++color.cc + create mode 100644 gettext-tools/woe32dll/c++file-ostream.cc + create mode 100644 gettext-tools/woe32dll/c++html-ostream.cc + create mode 100644 gettext-tools/woe32dll/c++styled-ostream.cc + create mode 100644 gettext-tools/woe32dll/c++term-ostream.cc + create mode 100644 gettext-tools/woe32dll/c++write-catalog.cc + create mode 100644 gettext-tools/woe32dll/c++write-po.cc + create mode 100644 gettext-tools/woe32dll/c++write-properties.cc + create mode 100644 gettext-tools/woe32dll/c++write-stringtable.cc + +Additional fix (COLOR_SOURCE) by Ray Donnelly <mingw.android@gmail.com> +Regenerated for 0.19.8.1 by Alexey Neyman <stilor@att.net> + +diff -urpN gettext-0.19.8.1.orig/gettext-tools/src/color.c gettext-0.19.8.1/gettext-tools/src/color.c +--- gettext-0.19.8.1.orig/gettext-tools/src/color.c 2017-01-23 15:13:25.448209511 -0800 ++++ gettext-0.19.8.1/gettext-tools/src/color.c 2017-01-23 15:13:53.168490941 -0800 +@@ -28,6 +28,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + ++#include "ostream.h" + #include "term-ostream.h" + #include "xalloc.h" + #include "relocatable.h" +diff -urpN gettext-0.19.8.1.orig/gettext-tools/src/Makefile.am gettext-0.19.8.1/gettext-tools/src/Makefile.am +--- gettext-0.19.8.1.orig/gettext-tools/src/Makefile.am 2017-01-23 15:13:25.452209551 -0800 ++++ gettext-0.19.8.1/gettext-tools/src/Makefile.am 2017-01-23 15:13:53.168490941 -0800 +@@ -145,10 +145,26 @@ FORMAT_SOURCE += \ + format-lua.c \ + format-javascript.c + ++if !WOE32DLL ++COLOR_SOURCE = color.c ++OUTPUT_SOURCE = \ ++ write-catalog.c \ ++ write-properties.c \ ++ write-stringtable.c \ ++ write-po.c ++else ++COLOR_SOURCE = ../woe32dll/c++color.cc ++OUTPUT_SOURCE = \ ++ ../woe32dll/c++write-catalog.cc \ ++ ../woe32dll/c++write-properties.cc \ ++ ../woe32dll/c++write-stringtable.cc \ ++ ../woe32dll/c++write-po.cc ++endif ++ + # libgettextsrc contains all code that is needed by at least two programs. + libgettextsrc_la_SOURCES = \ + $(COMMON_SOURCE) read-catalog.c \ +-color.c write-catalog.c write-properties.c write-stringtable.c write-po.c \ ++$(COLOR_SOURCE) $(OUTPUT_SOURCE) \ + msgl-ascii.c msgl-iconv.c msgl-equal.c msgl-cat.c msgl-header.c msgl-english.c \ + msgl-check.c file-list.c msgl-charset.c po-time.c plural-exp.c plural-eval.c \ + plural-table.c quote.h sentence.h sentence.c \ +diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++color.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++color.cc +--- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++color.cc 1969-12-31 16:00:00.000000000 -0800 ++++ gettext-0.19.8.1/gettext-tools/woe32dll/c++color.cc 2017-01-23 15:13:53.168490941 -0800 +@@ -0,0 +1 @@ ++#include "../src/color.c" +diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++file-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++file-ostream.cc +--- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++file-ostream.cc 1969-12-31 16:00:00.000000000 -0800 ++++ gettext-0.19.8.1/gettext-tools/woe32dll/c++file-ostream.cc 2017-01-23 15:13:53.168490941 -0800 +@@ -0,0 +1,2 @@ ++#include "../gnulib-lib/file-ostream.c" ++ +diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++html-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++html-ostream.cc +--- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++html-ostream.cc 1969-12-31 16:00:00.000000000 -0800 ++++ gettext-0.19.8.1/gettext-tools/woe32dll/c++html-ostream.cc 2017-01-23 15:13:53.168490941 -0800 +@@ -0,0 +1 @@ ++#include "../gnulib-lib/html-ostream.c" +diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++styled-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++styled-ostream.cc +--- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++styled-ostream.cc 1969-12-31 16:00:00.000000000 -0800 ++++ gettext-0.19.8.1/gettext-tools/woe32dll/c++styled-ostream.cc 2017-01-23 15:13:53.168490941 -0800 +@@ -0,0 +1 @@ ++#include "../gnulib-lib/styled-ostream.c" +diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++term-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++term-ostream.cc +--- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++term-ostream.cc 1969-12-31 16:00:00.000000000 -0800 ++++ gettext-0.19.8.1/gettext-tools/woe32dll/c++term-ostream.cc 2017-01-23 15:13:53.168490941 -0800 +@@ -0,0 +1 @@ ++#include "../gnulib-lib/term-ostream.c" +diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-catalog.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-catalog.cc +--- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-catalog.cc 1969-12-31 16:00:00.000000000 -0800 ++++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-catalog.cc 2017-01-23 15:13:53.168490941 -0800 +@@ -0,0 +1 @@ ++#include "../src/write-catalog.c" +diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-po.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-po.cc +--- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-po.cc 1969-12-31 16:00:00.000000000 -0800 ++++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-po.cc 2017-01-23 15:13:53.168490941 -0800 +@@ -0,0 +1 @@ ++#include "../src/write-po.c" +diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-properties.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-properties.cc +--- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-properties.cc 1969-12-31 16:00:00.000000000 -0800 ++++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-properties.cc 2017-01-23 15:13:53.168490941 -0800 +@@ -0,0 +1 @@ ++#include "../src/write-properties.c" +diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-stringtable.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-stringtable.cc +--- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-stringtable.cc 1969-12-31 16:00:00.000000000 -0800 ++++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-stringtable.cc 2017-01-23 15:13:53.168490941 -0800 +@@ -0,0 +1 @@ ++#include "../src/write-stringtable.c" +diff -urpN gettext-0.19.8.1.orig/gnulib-local/modules/file-ostream gettext-0.19.8.1/gnulib-local/modules/file-ostream +--- gettext-0.19.8.1.orig/gnulib-local/modules/file-ostream 2017-01-23 15:13:25.060205571 -0800 ++++ gettext-0.19.8.1/gnulib-local/modules/file-ostream 2017-01-23 15:13:53.168490941 -0800 +@@ -12,7 +12,11 @@ xalloc + configure.ac: + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += file-ostream.c ++else ++lib_SOURCES += ../woe32dll/c++file-ostream.cc ++endif + # This is a Makefile rule that generates multiple files at once; see the + # automake documentation, node "Multiple Outputs", for details. + file-ostream.h : $(top_srcdir)/build-aux/moopp file-ostream.oo.h file-ostream.oo.c ostream.oo.h +diff -urpN gettext-0.19.8.1.orig/gnulib-local/modules/html-ostream gettext-0.19.8.1/gnulib-local/modules/html-ostream +--- gettext-0.19.8.1.orig/gnulib-local/modules/html-ostream 2017-01-23 15:13:25.060205571 -0800 ++++ gettext-0.19.8.1/gnulib-local/modules/html-ostream 2017-01-23 15:13:53.168490941 -0800 +@@ -15,7 +15,11 @@ xalloc + configure.ac: + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += html-ostream.c ++else ++lib_SOURCES += ../woe32dll/c++html-ostream.cc ++endif + # This is a Makefile rule that generates multiple files at once; see the + # automake documentation, node "Multiple Outputs", for details. + html-ostream.h : $(top_srcdir)/build-aux/moopp html-ostream.oo.h html-ostream.oo.c ostream.oo.h +diff -urpN gettext-0.19.8.1.orig/gnulib-local/modules/ostream gettext-0.19.8.1/gnulib-local/modules/ostream +--- gettext-0.19.8.1.orig/gnulib-local/modules/ostream 2017-01-23 15:13:25.060205571 -0800 ++++ gettext-0.19.8.1/gnulib-local/modules/ostream 2017-01-23 15:13:53.168490941 -0800 +@@ -11,7 +11,11 @@ moo + configure.ac: + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += ostream.c ++else ++lib_SOURCES += ../woe32dll/c++ostream.cc ++endif + # This is a Makefile rule that generates multiple files at once; see the + # automake documentation, node "Multiple Outputs", for details. + ostream.h : $(top_srcdir)/build-aux/moopp ostream.oo.h ostream.oo.c +diff -urpN gettext-0.19.8.1.orig/gnulib-local/modules/styled-ostream gettext-0.19.8.1/gnulib-local/modules/styled-ostream +--- gettext-0.19.8.1.orig/gnulib-local/modules/styled-ostream 2017-01-23 15:13:25.060205571 -0800 ++++ gettext-0.19.8.1/gnulib-local/modules/styled-ostream 2017-01-23 15:13:53.168490941 -0800 +@@ -11,7 +11,11 @@ ostream + configure.ac: + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += styled-ostream.c ++else ++lib_SOURCES += ../woe32dll/c++styled-ostream.cc ++endif + # This is a Makefile rule that generates multiple files at once; see the + # automake documentation, node "Multiple Outputs", for details. + styled-ostream.h : $(top_srcdir)/build-aux/moopp styled-ostream.oo.h styled-ostream.oo.c ostream.oo.h +diff -urpN gettext-0.19.8.1.orig/gnulib-local/modules/term-ostream gettext-0.19.8.1/gnulib-local/modules/term-ostream +--- gettext-0.19.8.1.orig/gnulib-local/modules/term-ostream 2017-01-23 15:13:25.060205571 -0800 ++++ gettext-0.19.8.1/gnulib-local/modules/term-ostream 2017-01-23 15:13:53.172490983 -0800 +@@ -22,7 +22,11 @@ configure.ac: + gl_TERM_OSTREAM + + Makefile.am: ++if !WOE32DLL + lib_SOURCES += term-ostream.c ++else ++lib_SOURCES += ../woe32dll/c++term-ostream.cc ++endif + # This is a Makefile rule that generates multiple files at once; see the + # automake documentation, node "Multiple Outputs", for details. + term-ostream.h : $(top_srcdir)/build-aux/moopp term-ostream.oo.h term-ostream.oo.c ostream.oo.h diff --git a/patches/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/patches/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch new file mode 100644 index 0000000..3487302 --- /dev/null +++ b/patches/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch @@ -0,0 +1,72 @@ +diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c gettext-0.19.6/gettext-tools/gnulib-lib/execute.c +--- gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c 2015-10-24 16:54:39.310372500 +0100 ++++ gettext-0.19.6/gettext-tools/gnulib-lib/execute.c 2015-10-24 16:55:35.261954100 +0100 +@@ -52,7 +52,7 @@ + __cygwin_environ variable on cygwin64: + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + #if defined __CYGWIN__ && defined __x86_64__ +-extern DLL_VARIABLE char **environ; ++extern __attribute__((dllimport)) char **environ; + #endif + + +diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c +--- gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c 2015-09-11 04:03:56.000000000 +0100 ++++ gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c 2015-10-24 16:56:00.885918100 +0100 +@@ -52,7 +52,7 @@ + __cygwin_environ variable on cygwin64: + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + #if defined __CYGWIN__ && defined __x86_64__ +-extern DLL_VARIABLE char **environ; ++extern __attribute__((dllimport)) char **environ; + #endif + + +diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c +--- gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c 2015-09-11 04:03:58.000000000 +0100 ++++ gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c 2015-10-24 16:56:51.519198900 +0100 +@@ -26,7 +26,7 @@ + __cygwin_environ variable on cygwin64: + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + #if defined __CYGWIN__ && defined __x86_64__ +-extern DLL_VARIABLE char **environ; ++extern __attribute__((dllimport)) char **environ; + #endif + + int +diff -urN gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff gettext-0.19.6/gnulib-local/lib/execute.c.diff +--- gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff 2015-08-21 08:18:28.000000000 +0100 ++++ gettext-0.19.6/gnulib-local/lib/execute.c.diff 2015-10-24 16:58:17.182285000 +0100 +@@ -10,7 +10,7 @@ + + __cygwin_environ variable on cygwin64: + + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + +#if defined __CYGWIN__ && defined __x86_64__ +-+extern DLL_VARIABLE char **environ; +++extern __attribute__((dllimport)) char **environ; + +#endif + + + +diff -urN gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff +--- gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff 2015-08-21 08:18:28.000000000 +0100 ++++ gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff 2015-10-24 16:58:11.741447300 +0100 +@@ -10,7 +10,7 @@ + + __cygwin_environ variable on cygwin64: + + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + +#if defined __CYGWIN__ && defined __x86_64__ +-+extern DLL_VARIABLE char **environ; +++extern __attribute__((dllimport)) char **environ; + +#endif + + + +diff -urN gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff gettext-0.19.6/gnulib-local/tests/test-environ.c.diff +--- gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff 2015-08-21 08:18:28.000000000 +0100 ++++ gettext-0.19.6/gnulib-local/tests/test-environ.c.diff 2015-10-24 16:58:35.915765100 +0100 +@@ -10,7 +10,7 @@ + + __cygwin_environ variable on cygwin64: + + <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>. */ + +#if defined __CYGWIN__ && defined __x86_64__ +-+extern DLL_VARIABLE char **environ; +++extern __attribute__((dllimport)) char **environ; + +#endif + + + int diff --git a/patches/glibc/2.24/110-sh-fix-gcc6.patch b/patches/glibc/2.24/110-sh-fix-gcc6.patch new file mode 100644 index 0000000..cacf390 --- /dev/null +++ b/patches/glibc/2.24/110-sh-fix-gcc6.patch @@ -0,0 +1,28 @@ +From 279acf7a059f2d2296f690d7f2d886bd0e404f30 Mon Sep 17 00:00:00 2001 +From: Alexey Neyman <stilor@att.net> +Date: Wed, 25 Jan 2017 21:46:53 -0800 +Subject: [PATCH] sh: conditional is false in dl-conflict.c + +... ifdef it out, so that it doesn't create a call to abort(). + +Signed-off-by: Alexey Neyman <stilor@att.net> +--- + sysdeps/sh/dl-machine.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h +index 449deea..2b468af 100644 +--- a/sysdeps/sh/dl-machine.h ++++ b/sysdeps/sh/dl-machine.h +@@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, + break; + case R_SH_DIR32: + { +-#ifndef RTLD_BOOTSTRAP ++#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP + /* This is defined in rtld.c, but nowhere in the static + libc.a; make the reference weak so static programs can + still link. This declaration cannot be done when +-- +2.9.3 + diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 1ac9517..bf59232 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 2926876..6b860e9 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";; |