summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2012-11-03 15:50:51 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-11-03 15:58:25 (GMT)
commit1b5ce0e9a2867851cdb81aaa68b4007d5517250f (patch)
tree73a6cab2163361ba6bdaf94fe0be8e12de790bf8
parent22a6be4d43c9318cb21c8f351ef3c1132400008c (diff)
downloadbuildroot-1b5ce0e9a2867851cdb81aaa68b4007d5517250f.tar.gz
buildroot-1b5ce0e9a2867851cdb81aaa68b4007d5517250f.tar.bz2
iproute2: fix em_ipset build issue
Fixes http://autobuild.buildroot.net/results/be19e39c19b62946ea48dd6b3dfd55f5c3ccd7c9 em_ipset.c uses xtables.h from iptables, but the configure script fails to to check for this, so forcibly disable it if not available. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/iproute2/iproute2.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 03767cc..6f5ee51 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -24,6 +24,11 @@ define IPROUTE2_WITH_IPTABLES
$(SED) "s/-DIPT/-DXT/" $(IPROUTE2_DIR)/tc/Makefile
echo "TC_CONFIG_XT:=y" >>$(IPROUTE2_DIR)/Config
endef
+else
+define IPROUTE2_WITH_IPTABLES
+ # em_ipset needs xtables, but configure misdetects it
+ echo "TC_CONFIG_IPSET:=n" >>$(IPROUTE2_DIR)/Config
+endef
endif
define IPROUTE2_CONFIGURE_CMDS