From 026a27ade4a6f4e71b5da0c2b29f26bbbb1dbb45 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 20 Jun 2019 18:23:24 +0200 Subject: [PATCH] package/dnsmasq: add libidn2 support libidn2 is preferred over libidn, see src/util.c: #if defined(HAVE_LIBIDN2) #include #elif defined(HAVE_IDN) #include #endif So select libidn2 if libidn is not enabled Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dnsmasq/Config.in | 2 +- package/dnsmasq/dnsmasq.mk | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in index cec68a9eba..d7f3d74bd4 100644 --- a/package/dnsmasq/Config.in +++ b/package/dnsmasq/Config.in @@ -29,7 +29,7 @@ config BR2_PACKAGE_DNSMASQ_DNSSEC config BR2_PACKAGE_DNSMASQ_IDN bool "IDN support" - select BR2_PACKAGE_LIBIDN + select BR2_PACKAGE_LIBIDN2 if !BR2_PACKAGE_LIBIDN 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 366cebf012..f271523068 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -34,9 +34,14 @@ DNSMASQ_COPTS += -DNO_TFTP endif ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +DNSMASQ_DEPENDENCIES += libidn2 +DNSMASQ_COPTS += -DHAVE_LIBIDN2 +else DNSMASQ_DEPENDENCIES += libidn DNSMASQ_COPTS += -DHAVE_IDN endif +endif ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y) DNSMASQ_DEPENDENCIES += libnetfilter_conntrack