From 66ad1ff51411c24bfad7c1892f7481a9cdc924f8 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sun, 28 Jan 2018 11:42:24 -0800 Subject: Upgrade to new releases android-ndk, binutils, gcc, linux, mpfr, ncurses, newlib, uclibc-ng MPC vs MPFR dependencies required modifications in auto-generated templates to also provide non-inclusive older-than/newer-than specifications. Also correct MPC URLs, the website seems to have adjusted its directory layout. Currently, newlib 3.0.0 doesn't build for arm-nano-eabi. Signed-off-by: Alexey Neyman --- config/comp_libs/gmp.in | 2 +- config/comp_libs/mpc.in | 5 +++++ config/comp_libs/mpfr.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'config/comp_libs') diff --git a/config/comp_libs/gmp.in b/config/comp_libs/gmp.in index 9c7daf04..72702443 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 2d948a78..2ea3c0cc 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 f49d1a71..733d9edb 100644 --- a/config/comp_libs/mpfr.in +++ b/config/comp_libs/mpfr.in @@ -1 +1 @@ -# GMP options +# MPFR options -- cgit v1.2.3