Skip to contentSkip to conversation

dnsmasq: NLS/i18n does not mandate libidn anymore

PATCH New Fabrice Fontaine 2 participants 2 messages May 1, 2018 – Jun 6, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/1 dnsmasq: NLS/i18n does not mandate libidn anymore

Since May 2017, automatic inclusion of IDN has been removed when building internationalisation support:
http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=43cdf1c3d074e75389392d495690923ef37d3248

This patch is a first step before the addition of libidn2 package

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/dnsmasq/dnsmasq.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
package/dnsmasq/dnsmasq.mk +6 -6
index f519835828..79c5619966 100644
@@ -9,11 +9,14 @@ DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
-DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
-DNSMASQ_DEPENDENCIES = host-pkgconf
+DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \
+	LIBS+=$(TARGET_NLS_LIBS)
+DNSMASQ_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0
 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
 
+DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n)
+
 ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y)
 DNSMASQ_COPTS += -DNO_DHCP
 endif

@@ -30,12 +33,9 @@ ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y)
 DNSMASQ_COPTS += -DNO_TFTP
 endif
 
-# NLS requires IDN so only enable it (i18n) when IDN is true
 ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
-DNSMASQ_DEPENDENCIES += libidn $(TARGET_NLS_DEPENDENCIES)
-DNSMASQ_MAKE_OPTS += LIBS+=$(TARGET_NLS_LIBS)
+DNSMASQ_DEPENDENCIES += libidn
 DNSMASQ_COPTS += -DHAVE_IDN
-DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n)
 endif
 
 ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH 1/1 dnsmasq: NLS/i18n does not mandate libidn anymore

Hello,

Quoted 10 lines · Fabrice Fontaine

Since May 2017, automatic inclusion of IDN has been removed when building internationalisation support:
http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=43cdf1c3d074e75389392d495690923ef37d3248

This patch is a first step before the addition of libidn2 package

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/dnsmasq/dnsmasq.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com