[Buildroot] [PATCH 1/1] avahi: link with libintl if libglib2 is enabled

[Thomas Petazzoni]

Hello,

On Tue, 18 Oct 2016 16:53:23 +0200, Johan Oudinet wrote:

> diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
> index 069b45a..c9cf2bc 100644
> --- a/package/avahi/avahi.mk
> +++ b/package/avahi/avahi.mk
> @@ -168,7 +168,9 @@ endif
>  
>  AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)"
>  
> -AVAHI_MAKE_OPTS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
> +# If either locale or libglib2 is defined, avahi needs libintl.
> +AVAHI_MAKE_OPTS += \
> +	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_PACKAGE_LIBGLIB2),LIBS=-lintl)

Hum, I wondering if it wouldn't be nicer to rely on the fact that the
Config.in of those packages enable BR2_PACKAGE_GETTEXT when necessary.
So maybe we should instead rely on BR2_PACKAGE_GETTEXT=y, with
something like:

ifeq ($(BR2_PACKAGE_GETTEXT),y)
AVAHI_DEPENDENCIES += gettext
AVAHI_MAKE_OPTS += LIBS=-lintl
endif

(and of course, remove the gettext dependency added conditionally on
BR2_NEEDS_GETTEXT_IF_LOCALE).

It would be necessary to also test this with musl and glibc
configurations, with gettext enabled, to make sure it doesn't break.

And if it works, then we should update the Buildroot manual, which has
a section on the gettext integration.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com