From 2eadc95046fb480cbb1d6d54375f81a278ee1cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 10 Jul 2017 16:28:35 +0200 Subject: [PATCH] connman: fix both, glibc and musl gcc7 build --- srcpkgs/connman/patches/musl-fixes.patch | 26 ++++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/srcpkgs/connman/patches/musl-fixes.patch b/srcpkgs/connman/patches/musl-fixes.patch index 475646cd62b..d77a0a6c160 100644 --- a/srcpkgs/connman/patches/musl-fixes.patch +++ b/srcpkgs/connman/patches/musl-fixes.patch @@ -165,16 +165,24 @@ index c34e10a..eae66fc 100644 struct in6_addr ipi6_addr; /* src/dst IPv6 address */ unsigned int ipi6_ifindex; /* send/recv interface index */ --- src/inet.c 2016-04-18 09:04:30.000000000 +0200 -+++ src/inet.c 2017-07-07 18:14:31.092850333 +0200 -@@ -25,6 +25,11 @@ - #include - #endif ++++ src/inet.c 2017-07-10 16:25:33.100118139 +0200 +@@ -21,6 +21,11 @@ + * + */ +#if !defined(__GLIBC__) -+/* Prevent inclusion of /usr/include/linux/if_ether.h */ -+#define _LINUX_IF_ETHER_H ++/* Prevent inclusion of /usr/include/netinet/if_ether.h */ ++#define _NETINET_IF_ETHER_H +#endif + - #define _GNU_SOURCE - #include - #include + #ifdef HAVE_CONFIG_H + #include + #endif +@@ -34,6 +39,7 @@ + #include + #include + #include ++#include + #include + #include + #include