diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-03 22:42:08 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 01:27:24 +0200 |
| commit | 388bb94b3d2d6d3acb8b4cdce22d6f0ca3dd2ba6 (patch) | |
| tree | 92dfa09646f0a334660337471ce1a9aeb075236d /package/dnsmasq | |
| parent | 9494e46a07d82ff781a92af0b63676f15a5ecb85 (diff) | |
| download | buildroot-388bb94b3d2d6d3acb8b4cdce22d6f0ca3dd2ba6.tar.gz buildroot-388bb94b3d2d6d3acb8b4cdce22d6f0ca3dd2ba6.zip | |
dnsmasq: use 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
- dropping BR2_PACKAGE_GETTEXT selection
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/dnsmasq')
| -rw-r--r-- | package/dnsmasq/Config.in | 1 | ||||
| -rw-r--r-- | package/dnsmasq/dnsmasq.mk | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in index 936b1de509..8921fc629d 100644 --- a/package/dnsmasq/Config.in +++ b/package/dnsmasq/Config.in @@ -31,7 +31,6 @@ config BR2_PACKAGE_DNSMASQ_IDN bool "IDN support" depends on BR2_USE_WCHAR select BR2_PACKAGE_LIBIDN - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help Enable IDN support in dnsmasq. This option is a big space taker since it pulls in many diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index c6f15e2ea2..00a59dac01 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -32,8 +32,8 @@ endif # NLS requires IDN so only enable it (i18n) when IDN is true ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) -DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext -DNSMASQ_MAKE_OPTS += LIBS+="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" +DNSMASQ_DEPENDENCIES += libidn $(TARGET_NLS_DEPENDENCIES) +DNSMASQ_MAKE_OPTS += LIBS+=$(TARGET_NLS_LIBS) DNSMASQ_COPTS += -DHAVE_IDN DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n) endif |
