diff options
Diffstat (limited to 'meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch index b711b7aa36..03c36ccbc2 100644 --- a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch +++ b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | [PATCH] configure: Add option to enable/disable libnfnetlink | 1 | From c46db7c2e1f63ec525835553587e70c635565310 Mon Sep 17 00:00:00 2001 |
2 | From: "Maxin B. John" <maxin.john@intel.com> | ||
3 | Date: Tue, 21 Feb 2017 11:16:31 +0200 | ||
4 | Subject: [PATCH] configure: Add option to enable/disable libnfnetlink | ||
2 | 5 | ||
3 | This changes the configure behaviour from autodetecting | 6 | This changes the configure behaviour from autodetecting |
4 | for libnfnetlink to having an option to disable it explicitly | 7 | for libnfnetlink to having an option to disable it explicitly |
@@ -8,20 +11,24 @@ Upstream-Status: Pending | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 12 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
10 | --- | 13 | --- |
11 | diff -Naur iptables-1.6.0-old/configure.ac iptables-1.6.0/configure.ac | 14 | configure.ac | 10 +++++++--- |
12 | --- iptables-1.6.0-old/configure.ac 2015-12-28 18:40:35.255417976 +0200 | 15 | 1 file changed, 7 insertions(+), 3 deletions(-) |
13 | +++ iptables-1.6.0/configure.ac 2015-12-29 13:01:12.388840200 +0200 | 16 | |
14 | @@ -63,6 +63,9 @@ | 17 | diff --git a/configure.ac b/configure.ac |
18 | index eda7871..03ddc50 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], | ||
15 | AC_ARG_ENABLE([nftables], | 22 | AC_ARG_ENABLE([nftables], |
16 | AS_HELP_STRING([--disable-nftables], [Do not build nftables compat]), | 23 | AS_HELP_STRING([--disable-nftables], [Do not build nftables compat]), |
17 | [enable_nftables="$enableval"], [enable_nftables="yes"]) | 24 | [enable_nftables="$enableval"], [enable_nftables="yes"]) |
18 | +AC_ARG_ENABLE([libnfnetlink], | 25 | +AC_ARG_ENABLE([libnfnetlink], |
19 | + AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]), | 26 | + AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]), |
20 | + [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"]) | 27 | + [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"]) |
21 | 28 | AC_ARG_ENABLE([connlabel], | |
22 | libiptc_LDFLAGS2=""; | 29 | AS_HELP_STRING([--disable-connlabel], |
23 | AX_CHECK_LINKER_FLAGS([-Wl,--no-as-needed], | 30 | [Do not build libnetfilter_conntrack]), |
24 | @@ -123,9 +126,10 @@ | 31 | @@ -115,9 +118,10 @@ if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then |
25 | AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool)) | 32 | AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool)) |
26 | fi | 33 | fi |
27 | 34 | ||
@@ -35,3 +42,6 @@ diff -Naur iptables-1.6.0-old/configure.ac iptables-1.6.0/configure.ac | |||
35 | 42 | ||
36 | if test "x$enable_nftables" = "xyes"; then | 43 | if test "x$enable_nftables" = "xyes"; then |
37 | PKG_CHECK_MODULES([libmnl], [libmnl >= 1.0], [mnl=1], [mnl=0]) | 44 | PKG_CHECK_MODULES([libmnl], [libmnl >= 1.0], [mnl=1], [mnl=0]) |
45 | -- | ||
46 | 2.4.0 | ||
47 | |||