NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

whois: use the new gettext logic

Browse Source 
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, which means we no longer
   need to depend on BR2_USE_WCHAR, so this dependency is dropped

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-07-03 23:23:43 +02:00
parent 5f8d6569ed
commit 3eb862bff5
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/whois/Config.in
View File

@ -1,13 +1,7 @@
config BR2_PACKAGE_WHOIS
bool "whois"
depends on BR2_USE_WCHAR # gettext
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
help
Improved whois client.
http://www.linux.it/~md/software/
comment "whois needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS

8
package/whois/whois.mk
View File

@ -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