From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 3 Nov 2012 15:50:51 +0000 (+0100)
Subject: iproute2: fix em_ipset build issue
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1b5ce0e9a2867851cdb81aaa68b4007d5517250f;p=buildroot.git

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>
---

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 03767ccda8..6f5ee51607 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