jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/dnsmasq: add libidn2 support

Browse Source 
libidn2 is preferred over libidn, see src/util.c:
 #if defined(HAVE_LIBIDN2)
 #include <idn2.h>
 #elif defined(HAVE_IDN)
 #include <idna.h>
 #endif

So select libidn2 if libidn is not enabled

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2019-06-20 18:23:24 +02:00 committed by Thomas Petazzoni
parent bb216ed060
commit 026a27ade4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/dnsmasq/Config.in
View File

@ -29,7 +29,7 @@ config BR2_PACKAGE_DNSMASQ_DNSSEC
config BR2_PACKAGE_DNSMASQ_IDN config BR2_PACKAGE_DNSMASQ_IDN
bool "IDN support" bool "IDN support"
select BR2_PACKAGE_LIBIDN select BR2_PACKAGE_LIBIDN2 if !BR2_PACKAGE_LIBIDN
help help
Enable IDN support in dnsmasq. Enable IDN support in dnsmasq.
This option is a big space taker since it pulls in many This option is a big space taker since it pulls in many

5
package/dnsmasq/dnsmasq.mk
View File

@ -34,9 +34,14 @@ DNSMASQ_COPTS += -DNO_TFTP
endif endif
ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
ifeq ($(BR2_PACKAGE_LIBIDN2),y)
DNSMASQ_DEPENDENCIES += libidn2
DNSMASQ_COPTS += -DHAVE_LIBIDN2
else
DNSMASQ_DEPENDENCIES += libidn DNSMASQ_DEPENDENCIES += libidn
DNSMASQ_COPTS += -DHAVE_IDN DNSMASQ_COPTS += -DHAVE_IDN
endif endif
endif
ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y) ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
DNSMASQ_DEPENDENCIES += libnetfilter_conntrack DNSMASQ_DEPENDENCIES += libnetfilter_conntrack