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

net-tools: 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

 - using BR2_SYSTEM_ENABLE_NLS instead of BR2_ENABLE_LOCALE to decide
   if NLS support should be enabled or not

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

1
package/net-tools/Config.in
View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_NET_TOOLS config BR2_PACKAGE_NET_TOOLS
bool "net-tools" bool "net-tools"
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help help
A collection of programs that form the base set of the NET-3 A collection of programs that form the base set of the NET-3
networking distribution for the Linux operating system. networking distribution for the Linux operating system.

6
package/net-tools/net-tools.mk
View File

@ -6,7 +6,7 @@
NET_TOOLS_VERSION = 3f170bff115303e92319791cbd56371e33dcbf6d NET_TOOLS_VERSION = 3f170bff115303e92319791cbd56371e33dcbf6d
NET_TOOLS_SITE = git://git.code.sf.net/p/net-tools/code NET_TOOLS_SITE = git://git.code.sf.net/p/net-tools/code
NET_TOOLS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) NET_TOOLS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
NET_TOOLS_LICENSE = GPL-2.0+ NET_TOOLS_LICENSE = GPL-2.0+
NET_TOOLS_LICENSE_FILES = COPYING NET_TOOLS_LICENSE_FILES = COPYING
@ -20,7 +20,7 @@ define NET_TOOLS_CONFIGURE_CMDS
endef endef
# Enable I18N when appropiate # Enable I18N when appropiate
ifeq ($(BR2_ENABLE_LOCALE),y) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
define NET_TOOLS_ENABLE_I18N define NET_TOOLS_ENABLE_I18N
$(SED) 's:I18N 0:I18N 1:' $(@D)/config.h $(SED) 's:I18N 0:I18N 1:' $(@D)/config.h
endef endef
@ -35,7 +35,7 @@ NET_TOOLS_POST_CONFIGURE_HOOKS += NET_TOOLS_ENABLE_I18N NET_TOOLS_ENABLE_IPV6
define NET_TOOLS_BUILD_CMDS define NET_TOOLS_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" \ LIBS=$(TARGET_NLS_LIBS) \
$(MAKE) -C $(@D) $(MAKE) -C $(@D)
endef endef