[Buildroot] [PATCH 082/100] whois: use the new gettext logic

[Arnout Vandecappelle]

On 04-07-17 16:49, Thomas Petazzoni wrote:
> This commit switches to use the new gettext logic, which involves:
> 
>  - using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies
>    on gettext/host-gettext
> 
>  - using TARGET_NLS_LIBS to force linking against libintl
> 
>  - dropping BR2_PACKAGE_GETTEXT selection
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
> ---
>  package/whois/Config.in | 1 -
>  package/whois/whois.mk  | 8 ++------
>  2 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/package/whois/Config.in b/package/whois/Config.in
> index 0fbaf90..8e62ddf 100644
> --- a/package/whois/Config.in
> +++ b/package/whois/Config.in
> @@ -2,7 +2,6 @@ config BR2_PACKAGE_WHOIS
>  	bool "whois"
>  	depends on BR2_USE_WCHAR # gettext

 Should be checked if this is still needed.

 Regards,
 Arnout

>  	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
> -	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
>  	help
>  	  Improved whois client.
>  
> diff --git a/package/whois/whois.mk b/package/whois/whois.mk
> index 24b6b69..b773499 100644
> --- a/package/whois/whois.mk
> +++ b/package/whois/whois.mk
> @@ -8,17 +8,13 @@ WHOIS_VERSION = 5.2.14
>  WHOIS_SITE = http://snapshot.debian.org/archive/debian/20161230T032015Z/pool/main/w/whois
>  WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz
>  # take precedence over busybox implementation
> -WHOIS_DEPENDENCIES = host-gettext $(if $(BR2_PACKAGE_BUSYBOX),busybox)
> +WHOIS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) $(TARGET_NLS_DEPENDENCIES)
>  WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV)
>  WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
>  	LIBS="$(WHOIS_EXTRA_LIBS)"
>  WHOIS_LICENSE = GPL-2.0+
>  WHOIS_LICENSE_FILES = COPYING
> -
> -ifeq ($(BR2_NEEDS_GETTEXT),y)
> -WHOIS_DEPENDENCIES += gettext
> -WHOIS_EXTRA_LIBS += -lintl
> -endif
> +WHOIS_EXTRA_LIBS = $(TARGET_NLS_LIBS)
>  
>  ifeq ($(BR2_PACKAGE_LIBICONV),y)
>  WHOIS_DEPENDENCIES += libiconv
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF