From: Steven Barth <cyrus@openwrt.org>
Date: Wed, 18 Jun 2014 10:04:02 +0000 (+0000)
Subject: dnsmasq: use COPTS for compile time options
X-Git-Tag: reboot~6889
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6dbafaa15d12dd3a836f57bf6173a321b0d1051e;p=oweals%2Fopenwrt.git

dnsmasq: use COPTS for compile time options

As documented in config.h.
Doing otherwise will break dnsmasq's pkg-wrapper script to find its
libs to link to.

Signed-off-by: Andre Heider <a.heider@gmail.com>

SVN-Revision: 41241
---

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index 8e2d41c243..c0d3dc4f48 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -61,18 +61,19 @@ endef
 
 Package/dnsmasq-dhcpv6/conffiles = $(Package/dnsmasq/conffiles)
 
-TARGET_CFLAGS += \
-	-ffunction-sections -fdata-sections \
-	$(if $(CONFIG_IPV6),,-DNO_IPV6) -DNO_IPSET -DNO_AUTH
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+
+COPTS = $(if $(CONFIG_IPV6),,-DNO_IPV6) -DNO_IPSET -DNO_AUTH
 
 ifeq ($(BUILD_VARIANT),nodhcpv6)
-  TARGET_CFLAGS += -DNO_DHCP6
+	COPTS += -DNO_DHCP6
 endif
 
 MAKE_FLAGS := \
 	$(TARGET_CONFIGURE_OPTS) \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="-Wl,--gc-sections" \
+	COPTS="$(COPTS)" \
 	PREFIX="/usr"
 
 define Package/dnsmasq/install