Skip to contentSkip to conversation

package/elfutils: fix dependency on C library

PATCH New Yann E. MORIN 2 participants 2 messages Aug 8, 2015 – Aug 9, 2015

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/avrdude/Config.in    | 4 ++--
 package/elfutils/Config.in   | 4 ++--
 package/kexec-lite/Config.in | 4 ++--
 package/ltrace/Config.in     | 4 ++--
 package/racehound/Config.in  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
package/avrdude/Config.in +2 -2
index 79b26a2..460f155 100644
@@ -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
package/elfutils/Config.in +2 -2
index 19ab8fc..ca93770 100644
@@ -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"
package/kexec-lite/Config.in +2 -2
index 6242c46..ede5cba 100644
@@ -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)
package/ltrace/Config.in +2 -2
index 5576efc..ff4d7bd 100644
@@ -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)
package/racehound/Config.in +2 -2
index af56b03..b9c4f36 100644
@@ -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)
Signature · 1 line
1.9.1
Applied
#1 lore raw

PATCH 1/1 package/elfutils: fix dependency on C library

Dear Yann E. MORIN,

Quoted 14 lines · Yann E. MORIN

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 <[email protected]>
Signed-off-by "Yann E. MORIN" <[email protected]>
Quoted 7 lines
---
 package/avrdude/Config.in    | 4 ++--
 package/elfutils/Config.in   | 4 ++--
 package/kexec-lite/Config.in | 4 ++--
 package/ltrace/Config.in     | 4 ++--
 package/racehound/Config.in  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com