diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-13 08:48:22 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-13 08:51:00 +0200 |
| commit | 1f318e9d56cdcfbcee6f43afac5939b961597499 (patch) | |
| tree | b9706406d3afbec028d17118a0b83fe68f4b31ea /patches | |
| parent | 73550d2c3bf4ed462be454862441f5035be23788 (diff) | |
| download | ptxdist-1f318e9d56cdcfbcee6f43afac5939b961597499.tar.gz ptxdist-1f318e9d56cdcfbcee6f43afac5939b961597499.tar.xz | |
iptables: add upstream patch to fix parallel building
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/iptables-1.6.0/0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch | 34 | ||||
| -rw-r--r-- | patches/iptables-1.6.0/series | 4 |
2 files changed, 38 insertions, 0 deletions
diff --git a/patches/iptables-1.6.0/0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch b/patches/iptables-1.6.0/0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch new file mode 100644 index 000000000..20dab363c --- /dev/null +++ b/patches/iptables-1.6.0/0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch @@ -0,0 +1,34 @@ +From: Gustavo Zacarias <gustavo@zacarias.com.ar> +Date: Wed, 30 Dec 2015 14:51:30 -0300 +Subject: [PATCH] iptables: add xtables-config-parser.h to BUILT_SOURCES + +Otherwise other sources that use it might be built before it's ready leading +to build failure, for example by iptables/nft.c + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- + iptables/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/iptables/Makefile.am b/iptables/Makefile.am +index 3c0faa5a54df..c3eb8a81a445 100644 +--- a/iptables/Makefile.am ++++ b/iptables/Makefile.am +@@ -4,6 +4,8 @@ AM_CFLAGS = ${regular_CFLAGS} + AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS} + AM_YFLAGS = -d + ++BUILT_SOURCES = ++ + xtables_multi_SOURCES = xtables-multi.c iptables-xml.c + xtables_multi_CFLAGS = ${AM_CFLAGS} + xtables_multi_LDADD = ../extensions/libext.a +@@ -27,6 +29,7 @@ xtables_multi_LDADD += ../libxtables/libxtables.la -lm + + # nftables compatibility layer + if ENABLE_NFTABLES ++BUILT_SOURCES += xtables-config-parser.h + xtables_compat_multi_SOURCES = xtables-compat-multi.c iptables-xml.c + xtables_compat_multi_CFLAGS = ${AM_CFLAGS} + xtables_compat_multi_LDADD = ../extensions/libext.a ../extensions/libext_ebt.a diff --git a/patches/iptables-1.6.0/series b/patches/iptables-1.6.0/series new file mode 100644 index 000000000..5237a6efd --- /dev/null +++ b/patches/iptables-1.6.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-iptables-add-xtables-config-parser.h-to-BUILT_SOURCE.patch +# e834e669cfa6ff965112ccc3771de5a0 - git-ptx-patches magic |