aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Waldemar Brodkorb <wbx@openadk.org>2016-04-04 10:19:55 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-04-13 23:55:56 +0200
commit1287e31d60ccfb72931cf8b7e83ae80bc72f0cf0 (patch)
tree400b851128d4f2edad621b124ce8365fd5970385
parentd78ec543bf45e1965bb65a03c0be6ba7b313a68a (diff)
downloadbuildroot-1287e31d60ccfb72931cf8b7e83ae80bc72f0cf0.tar.gz
buildroot-1287e31d60ccfb72931cf8b7e83ae80bc72f0cf0.tar.bz2
strongswan: disable iptables support
There is a new conflict between Linux header (linux/if.h) and C library header (net/if.h) introduced by this commit to the Linux kernel: 1ffad83dffd675cd742286ae82dca7d746cb0da8 Mikko Rapeli is working on a solution, but it requires changes to the Linux kernel and C library. For now I would just disable the iptables feature in Strongswan. The changes fixes following autobuild error: http://autobuild.buildroot.net/results/e1693a714eb690988c1798b733d0ff143e50b3b9/ Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/strongswan/strongswan.mk9
1 files changed, 2 insertions, 7 deletions
diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
index e27606cc16..e7606c008f 100644
--- a/package/strongswan/strongswan.mk
+++ b/package/strongswan/strongswan.mk
@@ -71,15 +71,10 @@ STRONGSWAN_DEPENDENCIES += \
$(if $(BR2_PACKAGE_MYSQL),mysql)
endif
-ifeq ($(BR2_PACKAGE_IPTABLES),y)
-STRONGSWAN_DEPENDENCIES += iptables
+# disable connmark/forecast until net/if.h vs. linux/if.h conflict resolved
+# problem exist since linux 4.5 header changes
STRONGSWAN_CONF_OPTS += \
- --enable-connmark \
- --enable-forecast
-else
-STRONGSWAN_COF_OPTS += \
--disable-connmark \
--disable-forecast
-endif
$(eval $(autotools-package))