diff mbox

[3/3] package/libv4l: needs argp-standalone with musl toolchains

Message ID 1438448118-26198-3-git-send-email-romain.naour@openwide.fr
State Changes Requested
Headers show

Commit Message

Romain Naour Aug. 1, 2015, 4:55 p.m. UTC
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 package/libv4l/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Yann E. MORIN Aug. 2, 2015, 3:29 p.m. UTC | #1
Romain, All,

On 2015-08-01 18:55 +0200, Romain Naour spake thusly:
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
>  package/libv4l/Config.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in
> index 0437ba1..0ae12d1 100644
> --- a/package/libv4l/Config.in
> +++ b/package/libv4l/Config.in
> @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBV4L
>  	depends on !BR2_STATIC_LIBS # dlopen()
>  	depends on BR2_INSTALL_LIBSTDCPP
>  	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # media headers
> -	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
> +	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL

Ditto, you also need to adjust the build dependencies in the .mk .

However, that one is doing things differently than the other two. It
currently build-depends on argp-standalone and links with it as soon as
the package is enabled.

I'm nt sure that's the best soltuion; it should only do that if built
against uClibc or musl, like rng-tools and elfutils currently do.

Regards,
Yann E. MORIN.

>  	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
>  	help
>  	  libv4l is a collection of libraries which adds a thin abstraction
> -- 
> 2.4.3
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni Aug. 3, 2015, 9:16 a.m. UTC | #2
Dear Yann E. MORIN,

On Sun, 2 Aug 2015 17:29:03 +0200, Yann E. MORIN wrote:

> Ditto, you also need to adjust the build dependencies in the .mk .
> 
> However, that one is doing things differently than the other two. It
> currently build-depends on argp-standalone and links with it as soon as
> the package is enabled.
> 
> I'm nt sure that's the best soltuion; it should only do that if built
> against uClibc or musl, like rng-tools and elfutils currently do.

Since argp-standalone/Config.in has:

	depends on !BR2_TOOLCHAIN_USES_GLIBC

then there is really no difference between:

ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
...
endif

and

ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC)$(BR2_TOOLCHAIN_USES_MUSL),y)
...
endif

Best regards,

Thomas
Yann E. MORIN Aug. 3, 2015, 4:27 p.m. UTC | #3
Thomas, All,

On 2015-08-03 11:16 +0200, Thomas Petazzoni spake thusly:
> On Sun, 2 Aug 2015 17:29:03 +0200, Yann E. MORIN wrote:
> > Ditto, you also need to adjust the build dependencies in the .mk .
> > 
> > However, that one is doing things differently than the other two. It
> > currently build-depends on argp-standalone and links with it as soon as
> > the package is enabled.
> > 
> > I'm nt sure that's the best soltuion; it should only do that if built
> > against uClibc or musl, like rng-tools and elfutils currently do.
> 
> Since argp-standalone/Config.in has:
> 
> 	depends on !BR2_TOOLCHAIN_USES_GLIBC
> 
> then there is really no difference between:
> 
> ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
> ...
> endif
> 
> and
> 
> ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC)$(BR2_TOOLCHAIN_USES_MUSL),y)
> ...
> endif

OK, but in this case the two other packages should be changed to use the
same conditional code.

In the end, I don't mind which we use, as lon as we use it consistently
across packages.

Regards,
Yann E. MORIN.
diff mbox

Patch

diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in
index 0437ba1..0ae12d1 100644
--- a/package/libv4l/Config.in
+++ b/package/libv4l/Config.in
@@ -5,7 +5,7 @@  config BR2_PACKAGE_LIBV4L
 	depends on !BR2_STATIC_LIBS # dlopen()
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # media headers
-	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
+	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  libv4l is a collection of libraries which adds a thin abstraction