Commit fdad2e56 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent e86fc46a

package/avrdude/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line 
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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)