diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-03 23:01:00 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 01:28:45 +0200 |
| commit | 8f85d36e53b1fbf2e952bc6619e54a3c501b9735 (patch) | |
| tree | 800e7bb0cdbcc524f2bc154767307afb23fa7dec | |
| parent | a32783e38747960b2c46a370d5ddc1ff92911590 (diff) | |
| download | buildroot-8f85d36e53b1fbf2e952bc6619e54a3c501b9735.tar.gz buildroot-8f85d36e53b1fbf2e952bc6619e54a3c501b9735.zip | |
ndisc6: use the new gettext logic
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@free-electrons.com>
| -rw-r--r-- | package/ndisc6/Config.in | 1 | ||||
| -rw-r--r-- | package/ndisc6/ndisc6.mk | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/package/ndisc6/Config.in b/package/ndisc6/Config.in index 321bfbc963..a397ea6410 100644 --- a/package/ndisc6/Config.in +++ b/package/ndisc6/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_NDISC6 bool "ndisc6 tools" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help NDisc6 is a small collection of useful tools for IPv6 networking diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk index 8326fc707b..3ab8306d2e 100644 --- a/package/ndisc6/ndisc6.mk +++ b/package/ndisc6/ndisc6.mk @@ -7,15 +7,11 @@ NDISC6_VERSION = 1.0.2 NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2 NDISC6_SITE = http://www.remlab.net/files/ndisc6 -NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99" +NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99" LIBS=$(TARGET_NLS_LIBS) NDISC6_CONF_OPTS = --disable-rpath --disable-suid-install NDISC6_LICENSE = GPL-2.0 or GPL-3.0 NDISC6_LICENSE_FILES = COPYING - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -NDISC6_DEPENDENCIES += gettext -NDISC6_CONF_ENV += LIBS="-lintl" -endif +NDISC8_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) NDISC6_BIN_ += dnssort # perl script NDISC6_BIN_$(BR2_PACKAGE_NDISC6_NAME2ADDR) += name2addr addr2name |
