diff options
Diffstat (limited to 'meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch b/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch new file mode 100644 index 0000000000..89ad8f6668 --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Package libnetfilter-conntrack depends on package libnfnetlink. iptables | ||
2 | checks package libnetfilter-conntrack whatever its package config | ||
3 | libnfnetlink is enabled or not. When libnfnetlink is disabled but | ||
4 | package libnetfilter-conntrack exists, it fails randomly with: | ||
5 | |||
6 | | In file included from .../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0: | ||
7 | | .../tmp/sysroots/qemumips/usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:14:42: fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory | ||
8 | | compilation terminated. | ||
9 | | GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed | ||
10 | |||
11 | Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it. | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 5d7e62b..e331ee7 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -88,8 +88,12 @@ if test "$ac_cv_header_linux_ip_vs_h" != "yes"; then | ||
22 | blacklist_modules="$blacklist_modules ipvs"; | ||
23 | fi; | ||
24 | |||
25 | -PKG_CHECK_MODULES([libnetfilter_conntrack], [libnetfilter_conntrack >= 1.0.4], | ||
26 | +nfconntrack=0 | ||
27 | +AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ | ||
28 | + PKG_CHECK_MODULES([libnetfilter_conntrack], [libnetfilter_conntrack >= 1.0.4], | ||
29 | [nfconntrack=1], [nfconntrack=0]) | ||
30 | + ]) | ||
31 | + | ||
32 | AM_CONDITIONAL([HAVE_LIBNETFILTER_CONNTRACK], [test "$nfconntrack" = 1]) | ||
33 | |||
34 | if test "$nfconntrack" -ne 1; then | ||