diff options
| author | Alexey Neyman <stilor@att.net> | 2019-03-17 11:37:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-17 11:37:43 -0700 |
| commit | 89ba62fb1daad737cdb33c3b1ef69092beeaab0b (patch) | |
| tree | 34ea6400ccf438cd9de5d42afe636fde0a011f50 /config/libc | |
| parent | c4126d9397353a74ca5aff602dd2c0c527e1dd07 (diff) | |
| parent | e4475c33df8702ec780f24ac482d5d9c2fc72d6d (diff) | |
| download | crosstool-ng-89ba62fb1daad737cdb33c3b1ef69092beeaab0b.tar.gz crosstool-ng-89ba62fb1daad737cdb33c3b1ef69092beeaab0b.tar.bz2 crosstool-ng-89ba62fb1daad737cdb33c3b1ef69092beeaab0b.zip | |
Merge pull request #1163 from stilor/docker-fixescrosstool-ng-1.24.0-rc3
Fix build on CentOS6/7
Diffstat (limited to 'config/libc')
| -rw-r--r-- | config/libc/glibc.in | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 6598c31f..4138707f 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -23,8 +23,8 @@ endif # Glibc has some dependencies on the kernel headers: config GLIBC_DEP_KERNEL_HEADERS_VERSION - def_bool y - select LINUX_REQUIRE_3_2_or_later if GLIBC_2_24_or_later + def_bool y + select LINUX_REQUIRE_3_2_or_later if GLIBC_2_24_or_later # Glibc 2.26 requires at least binutils 2.25. # Also, binutils 2.30 fail while compiling aarch64 glibc; fixed in 2.27 @@ -35,6 +35,33 @@ 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 + def_bool y + select GLIBC_REQUIRE_older_than_2_29 if !CONFIGURE_has_python_3_4_or_newer + +config GLIBC_DEP_MAKE_4_0 + def_bool y + depends on GLIBC_2_29_or_later && !CONFIGURE_has_make_4_0_or_newer + select COMP_TOOLS_MAKE + select MAKE_REQUIRE_4_0_or_later + select MAKE_GNUMAKE_SYMLINK # Override old host make in .build/tools/bin + config GLIBC_DEP_GCC def_bool y select GCC_REQUIRE_4_9_or_later if GLIBC_2_26_or_later |