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 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
0326a06bea
commit
2d6300e67f
|
@ -9,11 +9,14 @@ DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
|
||||||
DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
|
DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
|
||||||
DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
|
DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
|
||||||
DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
|
DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
|
||||||
DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
|
DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||||
DNSMASQ_DEPENDENCIES = host-pkgconf
|
LIBS+=$(TARGET_NLS_LIBS)
|
||||||
|
DNSMASQ_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
|
||||||
DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0
|
DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0
|
||||||
DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
|
DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
|
||||||
|
|
||||||
|
DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n)
|
||||||
|
|
||||||
ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y)
|
ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y)
|
||||||
DNSMASQ_COPTS += -DNO_DHCP
|
DNSMASQ_COPTS += -DNO_DHCP
|
||||||
endif
|
endif
|
||||||
|
@ -30,12 +33,9 @@ ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y)
|
||||||
DNSMASQ_COPTS += -DNO_TFTP
|
DNSMASQ_COPTS += -DNO_TFTP
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# NLS requires IDN so only enable it (i18n) when IDN is true
|
|
||||||
ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
|
ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
|
||||||
DNSMASQ_DEPENDENCIES += libidn $(TARGET_NLS_DEPENDENCIES)
|
DNSMASQ_DEPENDENCIES += libidn
|
||||||
DNSMASQ_MAKE_OPTS += LIBS+=$(TARGET_NLS_LIBS)
|
|
||||||
DNSMASQ_COPTS += -DHAVE_IDN
|
DNSMASQ_COPTS += -DHAVE_IDN
|
||||||
DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n)
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
|
ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
|
||||||
|
|
Loading…
Reference in a new issue