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 | 50 |
1 files changed, 20 insertions, 30 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 ab609e27e3..b711b7aa36 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,47 +1,37 @@ | |||
1 | From 5c47cf5061b852c02178f01e23690bfe38a99d93 Mon Sep 17 00:00:00 2001 | 1 | [PATCH] configure: Add option to enable/disable libnfnetlink |
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 17 Mar 2013 11:21:35 -0700 | ||
4 | Subject: [PATCH] configure: Add option to enable/disable libnfnetlink | ||
5 | 2 | ||
6 | This changes the configure behaviour from autodetecting | 3 | This changes the configure behaviour from autodetecting |
7 | for libnfnetlink to having an option to disable it explicitly | 4 | for libnfnetlink to having an option to disable it explicitly |
8 | 5 | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
12 | --- | ||
13 | configure.ac | 11 ++++++++--- | ||
14 | 1 file changed, 8 insertions(+), 3 deletions(-) | ||
15 | 7 | ||
16 | diff --git a/configure.ac b/configure.ac | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
17 | index ba616ab..ce2d315 100644 | 9 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
18 | --- a/configure.ac | 10 | --- |
19 | +++ b/configure.ac | 11 | diff -Naur iptables-1.6.0-old/configure.ac iptables-1.6.0/configure.ac |
20 | @@ -53,6 +53,9 @@ AC_ARG_ENABLE([libipq], | 12 | --- iptables-1.6.0-old/configure.ac 2015-12-28 18:40:35.255417976 +0200 |
21 | AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], | 13 | +++ iptables-1.6.0/configure.ac 2015-12-29 13:01:12.388840200 +0200 |
22 | [Path to the pkgconfig directory [[LIBDIR/pkgconfig]]]), | 14 | @@ -63,6 +63,9 @@ |
23 | [pkgconfigdir="$withval"], [pkgconfigdir='${libdir}/pkgconfig']) | 15 | AC_ARG_ENABLE([nftables], |
16 | AS_HELP_STRING([--disable-nftables], [Do not build nftables compat]), | ||
17 | [enable_nftables="$enableval"], [enable_nftables="yes"]) | ||
24 | +AC_ARG_ENABLE([libnfnetlink], | 18 | +AC_ARG_ENABLE([libnfnetlink], |
25 | + AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]), | 19 | + AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]), |
26 | + [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"]) | 20 | + [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"]) |
27 | 21 | ||
28 | libiptc_LDFLAGS2=""; | 22 | libiptc_LDFLAGS2=""; |
29 | AX_CHECK_LINKER_FLAGS([-Wl,--no-as-needed], | 23 | AX_CHECK_LINKER_FLAGS([-Wl,--no-as-needed], |
30 | @@ -89,9 +92,11 @@ AM_CONDITIONAL([ENABLE_LARGEFILE], [test "$enable_largefile" = "yes"]) | 24 | @@ -123,9 +126,10 @@ |
31 | AM_CONDITIONAL([ENABLE_DEVEL], [test "$enable_devel" = "yes"]) | 25 | AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool)) |
32 | AM_CONDITIONAL([ENABLE_LIBIPQ], [test "$enable_libipq" = "yes"]) | 26 | fi |
33 | 27 | ||
34 | -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], | 28 | -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], |
35 | - [nfnetlink=1], [nfnetlink=0]) | 29 | - [nfnetlink=1], [nfnetlink=0]) |
36 | -AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) | 30 | -AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) |
37 | +AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ | 31 | +AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ |
38 | + PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0]) | 32 | + PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0]) |
39 | + ]) | 33 | + ]) |
40 | + | ||
41 | +AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) | 34 | +AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) |
42 | 35 | ||
43 | regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ | 36 | if test "x$enable_nftables" = "xyes"; then |
44 | -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ | 37 | PKG_CHECK_MODULES([libmnl], [libmnl >= 1.0], [mnl=1], [mnl=0]) |
45 | -- | ||
46 | 1.7.9.5 | ||
47 | |||