diff options
author | Alexey Neyman <stilor@att.net> | 2016-11-21 20:09:54 (GMT) |
---|---|---|
committer | Alexey Neyman <stilor@att.net> | 2016-11-22 07:03:03 (GMT) |
commit | 87bfd55b3b5329c7f306fa291ca5e0950a2c9da1 (patch) | |
tree | aa666685885104ed985b4c743ad3222968e7ae54 /config/companion_tools.in | |
parent | 488b27f58bfdb3c9c523448acfa17b51325fec03 (diff) |
Give companion tools some love.
Allow selection of make/m4/... version. Support imports of new versions
via addToolVersion.sh. Import newest versions of the companion tools.
One non-trivial change is the handling of make versions. Existing code
was not handling make companion tool as described (see the previous
commit). However, since most modern systems have make 4.x, that previous
commit made crosstool-ng always build make as a companion tool.
This traces back to the commit dd15c93 from 2014. That commit's log message
says that actually it was 3.81 which broke the build for certain component
(it was originally breaking eglibc, but I noticed it was breaking current
glibc on powerpc64), and introduced an option to force using 3.81 by
"components that really need it". It looks like in 2.5 years we haven't
seen any such components that really need make 3.81, and (given that make
has already had a few releases since 3.81) we're unlikely to see them
in the future.
Hence, the configure check is changed from "exactly 3.81" to "3.81 or newer".
In its current form, configure will accept make 3.80+, and will not require
make as a companion tool for 3.81+. We might want to bump the latter check
to even newer version given the claim from dd15c93. Killed
COMP_TOOLS_make_3_81_NEEDED.
Anyway, I retained 3.81 just in case; ditto for m4 1.14.3, autoconf 2.65
and automake 1.11.1.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'config/companion_tools.in')
-rw-r--r-- | config/companion_tools.in | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/config/companion_tools.in b/config/companion_tools.in index f922388..ece3552 100644 --- a/config/companion_tools.in +++ b/config/companion_tools.in @@ -2,14 +2,9 @@ menu "Companion tools" -# Tools that require make-3.81 to build should select this: -config COMP_TOOLS_make_3_81_NEEDED - bool - config COMP_TOOLS_FORCE_make_3_81 def_bool y - depends on COMP_TOOLS_make_3_81_NEEDED - depends on ! CONFIGURE_has_make381 + depends on ! CONFIGURE_has_make_3_81_or_newer select COMP_TOOLS select COMP_TOOLS_make @@ -20,7 +15,7 @@ config COMP_TOOLS prompt "Build some companion tools" help Crosstool-NG relies on some external tools to be recent enough, namely: - make = 3.81 (in some cases) + make >= 3.81 m4 >= 1.4.12 autoconf >= 2.63 automake >= 1.10.2 @@ -30,32 +25,7 @@ config COMP_TOOLS but you are strongly encouraged to update your system instead! if COMP_TOOLS - -config COMP_TOOLS_make - bool - prompt "make" - -config COMP_TOOLS_make_gmake - bool - prompt "Add gmake symlink to companion gnu/make" - depends on COMP_TOOLS_make - -config COMP_TOOLS_m4 - bool - prompt "m4" - -config COMP_TOOLS_autoconf - bool - prompt "autoconf" - -config COMP_TOOLS_automake - bool - prompt "automake" - -config COMP_TOOLS_libtool - bool - prompt "libtool" - +source "config.gen/companion_tools.in" endif endmenu |