Merge pull request #1674 from stilor/master

Updates to make `ct-ng build-all` pass

6 files changed, 12 insertions, 37 deletions

diff --git a/config/comp_libs/gettext.in b/config/comp_libs/gettext.in
index df7e336..85e4387 100644
--- a/config/comp_libs/gettext.in
+++ b/config/comp_libs/gettext.in
@@ -1 +1,11 @@
 # gettext options
+
+config GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG
+    def_bool y
+    depends on GETTEXT_0_21_or_later
+
+if GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG
+comment "This version of gettext is not compatible with uClibc-NG. Select"
+comment "a different version if uClibc-NG is used on the target or (in a"
+comment "Canadian cross build) on the host."
+endif
diff --git a/config/comp_libs/gmp.in b/config/comp_libs/gmp.in
index 7270244..f49d1a7 100644
--- a/config/comp_libs/gmp.in
+++ b/config/comp_libs/gmp.in
@@ -1,5 +1 @@
 # GMP options
-
-config GMP_HAS_MPBSD
-    bool
-    default y if !GMP_5_1_0_or_later
diff --git a/config/comp_libs/isl.in b/config/comp_libs/isl.in
index fe6fa8d..22b0cad 100644
--- a/config/comp_libs/isl.in
+++ b/config/comp_libs/isl.in
@@ -1,13 +1 @@
 # ISL options
-# CLooG 0.18.4 requires ISL 0.12 or newer
-# CLooG 0.18.1 requires ISL 0.12 or older
-## select CLOOG_REQUIRE_0_18_1_or_older if CLOOG_NEEDED && !ISL_0_12_or_later
-## select CLOOG_REQUIRE_0_18_4_or_later if CLOOG_NEEDED && !ISL_0_14_or_older
-
-config ISL_NEEDS_WITH_GMP
-    bool
-    default y if !ISL_0_12_or_later
-
-config ISL_HAS_WITH_PIPLIB
-    bool
-    default y if !ISL_0_14_or_later
diff --git a/config/comp_libs/mpc.in b/config/comp_libs/mpc.in
index 2ea3c0c..422935f 100644
--- a/config/comp_libs/mpc.in
+++ b/config/comp_libs/mpc.in
@@ -1,6 +1,3 @@
 # 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/newlib-nano.in b/config/comp_libs/newlib-nano.in
index 5a81fde..e7ef6f7 100644
--- a/config/comp_libs/newlib-nano.in
+++ b/config/comp_libs/newlib-nano.in
@@ -1,6 +1,7 @@
 # newlib-nano options
 
 ## depends on BARE_METAL
+## select LIBC_PROVIDES_CXA_ATEXIT
 
 ## help Newlib-nano is a C library intended for use on embedded systems. It is a
 ## help conglomeration of several library parts, all under free software
@@ -37,21 +38,6 @@ config NEWLIB_NANO_INSTALL_IN_TARGET
       Additionally the newlib-nano version of newlib.h will get copied to
       include/newlib-nano/newlib.h.
 
-# maybe older versions of newlib will support it too, but this
-# needs to be checked
-config NEWLIB_NANO_CXA_ATEXIT
-    def_bool y
-    depends on NEWLIB_NANO_2_0_or_later
-    select LIBC_PROVIDES_CXA_ATEXIT
-
-config NEWLIB_NANO_HAS_NANO_MALLOC
-    def_bool y
-    depends on NEWLIB_NANO_2_1_or_later
-
-config NEWLIB_NANO_HAS_NANO_FORMATTED_IO
-    def_bool y
-    depends on NEWLIB_NANO_2_2_or_later
-
 config LIBC_NEWLIB_NANO_TARGET_CFLAGS
     string
     prompt "Target CFLAGS for newlib"
@@ -225,7 +211,6 @@ config LIBC_NEWLIB_NANO_NANO_MALLOC
     bool
     prompt "Enable Nano Malloc"
     default y
-    depends on NEWLIB_NANO_HAS_NANO_MALLOC
     help
       NEWLIB has two implementations of malloc family's functions, one in
       `mallocr.c' and the other one in `nano-mallocr.c'.  This options
@@ -237,7 +222,6 @@ config LIBC_NEWLIB_NANO_NANO_FORMATTED_IO
     bool
     prompt "Enable Nano Formatted I/O"
     default y
-    depends on NEWLIB_NANO_HAS_NANO_FORMATTED_IO
     help
       This builds NEWLIB with a special implementation of formatted I/O
       functions, designed to lower the size of application on small systems
diff --git a/config/comp_libs/picolibc.in b/config/comp_libs/picolibc.in
index cb7a1e4..99f0e45 100644
--- a/config/comp_libs/picolibc.in
+++ b/config/comp_libs/picolibc.in
@@ -62,7 +62,7 @@ config LIBC_PICOLIBC_GLOBAL_ATEXIT
     prompt "Enable atexit data structure as global variable"
     help
         Enable atexit data structure as global variable, instead
-	of being thread-local.
+        of being thread-local.
 
 config LIBC_PICOLIBC_LITE_EXIT
     bool