aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2014-06-18 10:04:02 +0000
committerSteven Barth <cyrus@openwrt.org>2014-06-18 10:04:02 +0000
commit6dbafaa15d12dd3a836f57bf6173a321b0d1051e (patch)
treeac1b23697323fbea4035d68db30652ac5ad97f54
parent5e6024d52640dc1d66a45cfeec931e75b6f5f88b (diff)
downloadupstream-6dbafaa15d12dd3a836f57bf6173a321b0d1051e.tar.gz
upstream-6dbafaa15d12dd3a836f57bf6173a321b0d1051e.tar.bz2
upstream-6dbafaa15d12dd3a836f57bf6173a321b0d1051e.zip
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
-rw-r--r--package/network/services/dnsmasq/Makefile9
1 files changed, 5 insertions, 4 deletions
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