Re: [Buildroot] [PATCH v2 1/1] package/elfutils: enable on musl

From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Bernd Kuhls <bernd@kuhls.net>
Cc: Laurent Vivier <laurent@vivier.eu>,
	"Wojciech M . Zabolotny" <wzab01@gmail.com>,
	James Hilliard <james.hilliard1@gmail.com>,
	buildroot@buildroot.org, Romain Naour <romain.naour@gmail.com>,
	Tobias Waldekranz <tobias@waldekranz.com>
Subject: Re: [Buildroot] [PATCH v2 1/1] package/elfutils: enable on musl
Date: Sun, 22 Oct 2023 18:11:47 +0200	[thread overview]
Message-ID: <20231022161147.GP2607@scaer> (raw)
In-Reply-To: <20231022154133.1619344-1-bernd@kuhls.net>

Bernd, All,

On 2023-10-22 17:41 +0200, Bernd Kuhls spake thusly:
> Buildroot commit eb60820c0a9b3f938f32516f24df2eee9aac1e26 disabled
> elfutils for musl toolchains in 2015. Current code builds fine with musl
> so remove the exceptions.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
[--SNIP--]
> diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in
> index 5f45de14ab..c355048c6d 100644
> --- a/package/elfutils/Config.in
> +++ b/package/elfutils/Config.in
> @@ -1,17 +1,14 @@
> -comment "elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads"
> +comment "elfutils needs a toolchain w/ wchar, dynamic library, threads"
>  	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \
> -		|| !BR2_TOOLCHAIN_HAS_THREADS \
> -		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
> +		|| !BR2_TOOLCHAIN_HAS_THREADS
>  
>  config BR2_PACKAGE_ELFUTILS
>  	bool "elfutils"
>  	depends on BR2_USE_WCHAR
>  	depends on !BR2_STATIC_LIBS
>  	depends on BR2_TOOLCHAIN_HAS_THREADS
> -	# Only glibc and uClibc implement the myriad of required GNUisms
> -	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC
>  	select BR2_PACKAGE_ZLIB
> -	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
> +	select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC

I'm not a fan of this negative condition; I'd much prefer we use
positive logic. i.e. it is musl that needs argp-sa, so select it for
musl. uclibc needs it too, select it for uclibc.

But...

>  	select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC

... this negativity is already what we use for fts, so meh, let's keep
it for arg-sa.

See below for a bit more...

>  	help
>  	  Libraries/utilities to handle ELF objects (drop in
> diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
> index 0757851b72..28fcb52eb3 100644
> --- a/package/elfutils/elfutils.mk
> +++ b/package/elfutils/elfutils.mk
> @@ -61,8 +61,11 @@ HOST_ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod
>  ELFUTILS_CONF_ENV += \
>  	LDFLAGS="$(ELFUTILS_LDFLAGS)"
>  
> -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
> +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)

We already had a conditional block about !glibc, a bit above in the
file, so I moved all the libc-related conditions together.

Applied to master, thanks.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot