summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2018-02-02 06:16:05 (GMT)
committerGitHub <noreply@github.com>2018-02-02 06:16:05 (GMT)
commitfd9fe523b22cb6281f26081232a3f8f3aee7fda1 (patch)
tree9851733e0973e1de900d7f932e5b88fe637441f3 /config
parentba165ed4c0bfa8a83e61a2efd1ad205777978486 (diff)
parent36bb675a71cc66a2abd69bc82d613f2153d3791f (diff)
Merge pull request #904 from stilor/upgrade
A bunch of upgrades
Diffstat (limited to 'config')
-rw-r--r--config/comp_libs/gmp.in2
-rw-r--r--config/comp_libs/mpc.in5
-rw-r--r--config/comp_libs/mpfr.in2
-rw-r--r--config/configure.in.in3
-rw-r--r--config/libc/glibc.in5
5 files changed, 15 insertions, 2 deletions
diff --git a/config/comp_libs/gmp.in b/config/comp_libs/gmp.in
index 9c7daf0..7270244 100644
--- a/config/comp_libs/gmp.in
+++ b/config/comp_libs/gmp.in
@@ -2,4 +2,4 @@
config GMP_HAS_MPBSD
bool
- default y if !GMP_5_1_or_later
+ default y if !GMP_5_1_0_or_later
diff --git a/config/comp_libs/mpc.in b/config/comp_libs/mpc.in
index 2d948a7..2ea3c0c 100644
--- a/config/comp_libs/mpc.in
+++ b/config/comp_libs/mpc.in
@@ -1 +1,6 @@
# MPC options
+# MPC 1.1.0 and later requires MPFR 3.0.0 or later and GMP 5.0.0 or later.
+# MPC 1.0.x and earlier break with MPFR 4.0.0.
+## select MPFR_REQUIRE_3_0_0_or_later if MPFR_NEEDED && MPC_1_1_0_or_later
+## select GMP_REQUIRE_5_0_0_or_later if GMP_NEEDED && MPC_1_1_0_or_later
+## select MPFR_REQUIRE_older_than_4_0_0 if MPFR_NEEDED && !MPC_1_1_0_or_later
diff --git a/config/comp_libs/mpfr.in b/config/comp_libs/mpfr.in
index f49d1a7..733d9ed 100644
--- a/config/comp_libs/mpfr.in
+++ b/config/comp_libs/mpfr.in
@@ -1 +1 @@
-# GMP options
+# MPFR options
diff --git a/config/configure.in.in b/config/configure.in.in
index aaebbde..3560336 100644
--- a/config/configure.in.in
+++ b/config/configure.in.in
@@ -44,3 +44,6 @@ config CONFIGURE_has_svn
config CONFIGURE_has_git
@KCONFIG_git@
+
+config CONFIGURE_has_install_with_strip_program
+ @KCONFIG_install_with_strip_program@
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index fcd449d..a297bb1 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -26,9 +26,14 @@ config GLIBC_DEP_KERNEL_HEADERS_VERSION
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
+# and backported to 2.26. For other versions, require binutils older than
+# 2.30 (if the patch is backported, binutils 2.23 will break).
config GLIBC_DEP_BINUTILS
def_bool y
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
config GLIBC_DEP_GCC
def_bool y