diff options
| author | Brendan Heading <brendanheading@gmail.com> | 2015-08-02 22:53:46 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-08-03 11:19:19 +0200 |
| commit | 61fe902bacaca7c5fdcc7d3a68ded95a835fe2e1 (patch) | |
| tree | cc2f8117bed3addb10c99c59fce595d5701937fc /package/arptables/0003-src-Remove-support-for-libc5.patch | |
| parent | c22f16317646d2d0b5f2736d641820f757422054 (diff) | |
| download | buildroot-61fe902bacaca7c5fdcc7d3a68ded95a835fe2e1.tar.gz buildroot-61fe902bacaca7c5fdcc7d3a68ded95a835fe2e1.zip | |
package/arptables: fix musl compilation issues
Fixes http://autobuild.buildroot.net/results/841/841129b8f49df205e1dabc2c2a5be70fa266768b/
Backported two patches from upstream which had solved this problem.
Please note that 0002-src-Use-stdint-types.patch is modified to apply
cleanly - details in the patch file.
Signed-off-by: Brendan Heading <brendanheading@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/arptables/0003-src-Remove-support-for-libc5.patch')
| -rw-r--r-- | package/arptables/0003-src-Remove-support-for-libc5.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/package/arptables/0003-src-Remove-support-for-libc5.patch b/package/arptables/0003-src-Remove-support-for-libc5.patch new file mode 100644 index 0000000000..15e893dd0c --- /dev/null +++ b/package/arptables/0003-src-Remove-support-for-libc5.patch @@ -0,0 +1,64 @@ +From 5f1379ff68bfedb56309527bee266a591b27a19e Mon Sep 17 00:00:00 2001 +From: Felix Janda <felix.janda@posteo.de> +Date: Sat, 16 May 2015 10:31:41 +0200 +Subject: [PATCH 2/2] src: Remove support for libc5 + +Fixes compilation with musl libc + +Backport of upstream commit f4ab8f63f11a72f14687a6646d04ae1bae3fa45f +Upstream status: backport +Signed-off-by: Felix Janda <felix.janda@posteo.de> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +Signed-off-by: Brendan Heading <brendanheading@gmail.com> +--- + include/libarptc/arpt_kernel_headers.h | 12 ------------ + libarptc/libarptc.c | 4 ---- + 2 files changed, 16 deletions(-) + +diff --git a/include/libarptc/arpt_kernel_headers.h b/include/libarptc/arpt_kernel_headers.h +index 442cc54..140e999 100644 +--- a/include/libarptc/arpt_kernel_headers.h ++++ b/include/libarptc/arpt_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> +@@ -14,16 +13,5 @@ + #include <netinet/ether.h> + #include <net/if.h> + #include <sys/types.h> +-#else +-#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/libarptc/libarptc.c b/libarptc/libarptc.c +index 701bae0..9c5a5b0 100644 +--- a/libarptc/libarptc.c ++++ b/libarptc/libarptc.c +@@ -23,10 +23,6 @@ + #define inline + #endif + +-#if !defined(__GLIBC__) || (__GLIBC__ < 2) +-typedef unsigned int socklen_t; +-#endif +- + #include "libarptc/libarptc.h" + + #define IP_VERSION 4 +-- +2.4.3 + |
