From b3cce054ef381502af4f58105604081bf431ac9e Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 4 Mar 2019 00:22:02 -0800 Subject: Meet our new companion tool, bison Which is here courtesy of CentOS6, which only has bison 2.4 - while new glibc requires 2.7. Signed-off-by: Alexey Neyman --- config/comp_tools/bison.in | 1 + config/configure.in.in | 3 +++ config/libc/glibc.in | 14 ++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 config/comp_tools/bison.in (limited to 'config') diff --git a/config/comp_tools/bison.in b/config/comp_tools/bison.in new file mode 100644 index 00000000..b0dc9e17 --- /dev/null +++ b/config/comp_tools/bison.in @@ -0,0 +1 @@ +# GNU bison diff --git a/config/configure.in.in b/config/configure.in.in index c8df5a35..27e9f168 100644 --- a/config/configure.in.in +++ b/config/configure.in.in @@ -39,6 +39,9 @@ config CONFIGURE_has_gnu_m4_1_4_12_or_newer config CONFIGURE_has_python_3_4_or_newer @KCONFIG_python_3_4_or_newer@ +config CONFIGURE_has_bison_2_7_or_newer + @KCONFIG_bison_2_7_or_newer@ + config CONFIGURE_has_python @KCONFIG_python@ diff --git a/config/libc/glibc.in b/config/libc/glibc.in index e27a4f68..4138707f 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -35,6 +35,20 @@ config GLIBC_DEP_BINUTILS select BINUTILS_REQUIRE_2_25_or_later if GLIBC_2_26_or_later select BINUTILS_REQUIRE_older_than_2_30 if GLIBC_older_than_2_26 && ARCH_ARM && ARCH_64 +# Glibc 2.29 requires GCC5+ or, for ppc64le, GCC6.2+. We only support the latest +# release on GCC6 branch, so just assume it is newer than 6.2 +config GLIBC_DEP_GCC + def_bool y + select GCC_REQUIRE_5_or_later if GLIBC_2_29_or_later + select GCC_REQUIRE_6_or_later if GLIBC_2_29_or_later && ARCH_POWERPC && ARCH_64 && ARCH_LE + +# Glibc 2.29 requires bison 2.7 or later. All versions in ct-ng satisfy that +# version requirement. +config GLIBC_DEP_BISON + def_bool y + depends on GLIBC_2_29_or_later && !CONFIGURE_has_bison_2_7_or_newer + select COMP_TOOLS_BISON + # Glibc 2.29 now requires Python 3.4 or later, and make 4.0 or later. Ensure # we build 'make' as a companion tool if host's make isn't new enough. config GLIBC_DEP_PYTHON -- cgit v1.2.3