package/elfutils: fix dependency on C library

As Thomas puts it:

    The comment can only be visible when a toolchain that is *not*
    uclibc and *not* glibc is used. I.e, the comment is now only visible
    when musl is used. Which is not what we want.

Indeed, I completely borked the conditions. When a glibc or uClibc
toolchain is selected, the comment is entirely hidden, and we don;t get
the extra requirements (wchar, !static).

Fix that with the solution proposed by Thomas.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/avrdude/Config.in b/package/avrdude/Config.in
index 79b26a23c960c1e3223e9830a157fc3f1c4ccb53..460f1550862d995b69a818642daefb549800fbd4 100644 (file)
--- a/package/avrdude/Config.in
+++ b/package/avrdude/Config.in
@@ -16,6 +16,6 @@ config BR2_PACKAGE_AVRDUDE
          https://github.com/kcuzner/avrdude
 
 comment "avrdude needs a uclibc or (e)glibc toolchain w/ threads, wchar, dynamic library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC && !BR2_TOOLCHAIN_USES_GLIBC
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS \
+               || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
        depends on !BR2_bfin

diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in
index 19ab8fca310c2ad592d8898d5aa48172b6b792be..ca93770bfb9d001f0ed6df1ee2b6c62c4f96da73 100644 (file)
--- a/package/elfutils/Config.in
+++ b/package/elfutils/Config.in
@@ -1,7 +1,7 @@
 comment "elfutils needs a uClibc or (e)glibc toolchain w/ wchar, dynamic library"
        depends on !BR2_bfin
-       depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC && !BR2_TOOLCHAIN_USES_GLIBC
+       depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \
+               || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
 
 config BR2_PACKAGE_ELFUTILS
        bool "elfutils"

diff --git a/package/kexec-lite/Config.in b/package/kexec-lite/Config.in
index 6242c46c984726dc3f25d3bcf9a1cf06b2ec602d..ede5cba43ce890d29ffc218af29d56a88a078d96 100644 (file)
--- a/package/kexec-lite/Config.in
+++ b/package/kexec-lite/Config.in
@@ -16,5 +16,5 @@ config BR2_PACKAGE_KEXEC_LITE
 
 comment "kexec-lite needs a uClibc or (e)glibc toolchain w/ wchar, dynamic library"
        depends on BR2_powerpc || BR2_powerpc64
-       depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC && !BR2_TOOLCHAIN_USES_GLIBC
+       depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR \
+               || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)

diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index 5576efc5131089cafb7dd553374c4a1522dff66d..ff4d7bd3b01e702ea4e0f5fbbccabf811d1adcd8 100644 (file)
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -19,5 +19,5 @@ config BR2_PACKAGE_LTRACE
          http://ltrace.org
 
 comment "ltrace needs a uclibc or (e)glibc toolchain w/ wchar, dynamic library"
-       depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC && !BR2_TOOLCHAIN_USES_GLIBC
+       depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \
+               || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)

diff --git a/package/racehound/Config.in b/package/racehound/Config.in
index af56b0310b2dc05be7bcb568fb022d0067a4e805..b9c4f364c156db84c1c6b31f85da05511d85bbfe 100644 (file)
--- a/package/racehound/Config.in
+++ b/package/racehound/Config.in
@@ -30,6 +30,6 @@ comment "racehound needs an Linux kernel >= 3.14 to be built"
        depends on BR2_i386 || BR2_x86_64
 
 comment "racehound needs a uClibc or (e)glibc toolchain w/ C++, wchar, dynamic library"
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || BR2_STATIC_LIBS
        depends on BR2_i386 || BR2_x86_64
-       depends on !BR2_TOOLCHAIN_USES_UCLIBC && !BR2_TOOLCHAIN_USES_GLIBC
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || BR2_STATIC_LIBS \
+               || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)