69ced96355
Add a patch that defines _LINUX_IF_ETHER_H in netinet/if_ether.h to avoid the conflicting kernel if_ether.h. Other musl distros (Alpine, Sabotage, Gentoo) patch[1] the kernel headers instead. This is not practical in Buildroot, since we allow the user to choose the kernel version. This only fixes the normal case of including linux/if_ether.h (directly or indirectly) after netinet/if_ether.h. Fixes (tcpreplay): http://autobuild.buildroot.net/results/a65/a65b27f9e288f94f041ced64313dbf55af47bf36/ [1] https://cgit.gentoo.org/proj/musl.git/diff/sys-kernel/linux-headers/files/libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch?id=8eddda8072add075ebf56cf6d288bc1450d6b5f8 Cc: Rich Felker <dalias@aerifal.cx> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
31 lines
819 B
Diff
31 lines
819 B
Diff
From 3984adc4976de7553f51e0cf4de1e18c373b332b Mon Sep 17 00:00:00 2001
|
|
From: Baruch Siach <baruch@tkos.co.il>
|
|
Date: Thu, 15 Dec 2016 15:10:19 +0200
|
|
Subject: [PATCH] Avoid redefinition of struct ethhdr
|
|
|
|
This is a workaround to the if_ether.h conflict between musl and the kernel.
|
|
Both define struct ethhdr.
|
|
|
|
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
---
|
|
include/netinet/if_ether.h | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h
|
|
index 11ee65823f93..cfe1949d3371 100644
|
|
--- a/include/netinet/if_ether.h
|
|
+++ b/include/netinet/if_ether.h
|
|
@@ -1,6 +1,9 @@
|
|
#ifndef _NETINET_IF_ETHER_H
|
|
#define _NETINET_IF_ETHER_H
|
|
|
|
+/* Suppress kernel if_ether.h header inclusion */
|
|
+#define _LINUX_IF_ETHER_H
|
|
+
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
|
|
--
|
|
2.10.2
|
|
|