diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-04-10 18:20:41 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-13 22:28:36 +0100 |
commit | d30fba63286dc8f5ac72ac65fae6af6001e58ec2 (patch) | |
tree | 95fa5224a699ef1e0ffc204b0b1322d6434ed624 /meta/recipes-extended/iptables | |
parent | 3386ab153608f584e6b7e17c4bd0554e2ab31c66 (diff) | |
download | openembedded-core-d30fba63286dc8f5ac72ac65fae6af6001e58ec2.tar.gz openembedded-core-d30fba63286dc8f5ac72ac65fae6af6001e58ec2.tar.bz2 openembedded-core-d30fba63286dc8f5ac72ac65fae6af6001e58ec2.zip |
iptables: Fix build on musl
Added needed headers and resuffled existing ones to get it portable
Added defined for missing TCOPTS*
Change-Id: I74977dd052c5569b00631379d7f4bacfb86cf381
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iptables')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch | 89 | ||||
-rw-r--r-- | meta/recipes-extended/iptables/iptables_1.4.21.bb | 1 |
2 files changed, 90 insertions, 0 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch b/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch new file mode 100644 index 0000000000..7a003d912f --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch @@ -0,0 +1,89 @@ +From 7c07b7fd4fdd7844dd032af822306f08e4422c34 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 6 Apr 2015 20:47:29 -0700 +Subject: [PATCH] fix build with musl + +Add needed headers they are just not needed for glibc6+ but also +for musl +Define additional TCOPTS if not there + +u_initX types are in sys/types.h be explicit about it + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + extensions/libxt_TCPOPTSTRIP.c | 15 +++++++++++++++ + include/libiptc/ipt_kernel_headers.h | 12 ------------ + include/linux/netfilter_ipv4/ip_tables.h | 1 + + 3 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/extensions/libxt_TCPOPTSTRIP.c b/extensions/libxt_TCPOPTSTRIP.c +index 6897857..8a170b2 100644 +--- a/extensions/libxt_TCPOPTSTRIP.c ++++ b/extensions/libxt_TCPOPTSTRIP.c +@@ -12,6 +12,21 @@ + #ifndef TCPOPT_MD5SIG + # define TCPOPT_MD5SIG 19 + #endif ++#ifndef TCPOPT_MAXSEG ++# define TCPOPT_MAXSEG 2 ++#endif ++#ifndef TCPOPT_WINDOW ++# define TCPOPT_WINDOW 3 ++#endif ++#ifndef TCPOPT_SACK_PERMITTED ++# define TCPOPT_SACK_PERMITTED 4 ++#endif ++#ifndef TCPOPT_SACK ++# define TCPOPT_SACK 5 ++#endif ++#ifndef TCPOPT_TIMESTAMP ++# define TCPOPT_TIMESTAMP 8 ++#endif + + enum { + O_STRIP_OPTION = 0, +diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h +index 18861fe..a5963e9 100644 +--- a/include/libiptc/ipt_kernel_headers.h ++++ b/include/libiptc/ipt_kernel_headers.h +@@ -5,7 +5,6 @@ + + #include <limits.h> + +-#if defined(__GLIBC__) && __GLIBC__ == 2 + #include <netinet/ip.h> + #include <netinet/in.h> + #include <netinet/ip_icmp.h> +@@ -13,15 +12,4 @@ + #include <netinet/udp.h> + #include <net/if.h> + #include <sys/types.h> +-#else /* libc5 */ +-#include <sys/socket.h> +-#include <linux/ip.h> +-#include <linux/in.h> +-#include <linux/if.h> +-#include <linux/icmp.h> +-#include <linux/tcp.h> +-#include <linux/udp.h> +-#include <linux/types.h> +-#include <linux/in6.h> +-#endif + #endif +diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h +index 57fd82a..4807246 100644 +--- a/include/linux/netfilter_ipv4/ip_tables.h ++++ b/include/linux/netfilter_ipv4/ip_tables.h +@@ -15,6 +15,7 @@ + #ifndef _IPTABLES_H + #define _IPTABLES_H + ++#include <sys/types.h> + #include <linux/types.h> + + #include <linux/netfilter_ipv4.h> +-- +2.1.4 + diff --git a/meta/recipes-extended/iptables/iptables_1.4.21.bb b/meta/recipes-extended/iptables/iptables_1.4.21.bb index dc17d575dd..31c017b2ce 100644 --- a/meta/recipes-extended/iptables/iptables_1.4.21.bb +++ b/meta/recipes-extended/iptables/iptables_1.4.21.bb @@ -22,6 +22,7 @@ FILES_${PN}-dbg =+ "${libdir}/xtables/.debug" SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://types.h-add-defines-that-are-required-for-if_packet.patch \ file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ + file://0001-fix-build-with-musl.patch \ " SRC_URI[md5sum] = "536d048c8e8eeebcd9757d0863ebb0c0" |