diff options
Diffstat (limited to 'meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch')
-rw-r--r-- | meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch | 118 |
1 files changed, 0 insertions, 118 deletions
diff --git a/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch b/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch deleted file mode 100644 index eefc6834b7..0000000000 --- a/meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch +++ /dev/null | |||
@@ -1,118 +0,0 @@ | |||
1 | From 67645a01a2f3f52625d8dd77f2811a9e213e1b7d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 13 Sep 2015 13:28:20 -0700 | ||
4 | Subject: [PATCH] Fix header inclusions for musl | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | Upstream-Status: Pending | ||
9 | |||
10 | gweb/gresolv.c | 1 + | ||
11 | plugins/wifi.c | 3 +-- | ||
12 | src/tethering.c | 2 -- | ||
13 | tools/dhcp-test.c | 1 - | ||
14 | tools/dnsproxy-test.c | 1 + | ||
15 | 5 files changed, 3 insertions(+), 5 deletions(-) | ||
16 | |||
17 | Index: connman-1.30/gweb/gresolv.c | ||
18 | =================================================================== | ||
19 | --- connman-1.30.orig/gweb/gresolv.c | ||
20 | +++ connman-1.30/gweb/gresolv.c | ||
21 | @@ -28,6 +28,7 @@ | ||
22 | #include <stdarg.h> | ||
23 | #include <string.h> | ||
24 | #include <stdlib.h> | ||
25 | +#include <stdio.h> | ||
26 | #include <resolv.h> | ||
27 | #include <sys/types.h> | ||
28 | #include <sys/socket.h> | ||
29 | Index: connman-1.30/plugins/wifi.c | ||
30 | =================================================================== | ||
31 | --- connman-1.30.orig/plugins/wifi.c | ||
32 | +++ connman-1.30/plugins/wifi.c | ||
33 | @@ -30,9 +30,8 @@ | ||
34 | #include <string.h> | ||
35 | #include <sys/ioctl.h> | ||
36 | #include <sys/socket.h> | ||
37 | -#include <linux/if_arp.h> | ||
38 | -#include <linux/wireless.h> | ||
39 | #include <net/ethernet.h> | ||
40 | +#include <linux/wireless.h> | ||
41 | |||
42 | #ifndef IFF_LOWER_UP | ||
43 | #define IFF_LOWER_UP 0x10000 | ||
44 | Index: connman-1.30/src/tethering.c | ||
45 | =================================================================== | ||
46 | --- connman-1.30.orig/src/tethering.c | ||
47 | +++ connman-1.30/src/tethering.c | ||
48 | @@ -31,10 +31,8 @@ | ||
49 | #include <stdio.h> | ||
50 | #include <sys/ioctl.h> | ||
51 | #include <net/if.h> | ||
52 | -#include <linux/sockios.h> | ||
53 | #include <string.h> | ||
54 | #include <fcntl.h> | ||
55 | -#include <linux/if_tun.h> | ||
56 | #include <netinet/in.h> | ||
57 | #include <linux/if_bridge.h> | ||
58 | |||
59 | Index: connman-1.30/tools/dhcp-test.c | ||
60 | =================================================================== | ||
61 | --- connman-1.30.orig/tools/dhcp-test.c | ||
62 | +++ connman-1.30/tools/dhcp-test.c | ||
63 | @@ -33,7 +33,6 @@ | ||
64 | #include <arpa/inet.h> | ||
65 | #include <net/route.h> | ||
66 | #include <net/ethernet.h> | ||
67 | -#include <linux/if_arp.h> | ||
68 | |||
69 | #include <gdhcp/gdhcp.h> | ||
70 | |||
71 | Index: connman-1.30/tools/dnsproxy-test.c | ||
72 | =================================================================== | ||
73 | --- connman-1.30.orig/tools/dnsproxy-test.c | ||
74 | +++ connman-1.30/tools/dnsproxy-test.c | ||
75 | @@ -27,6 +27,7 @@ | ||
76 | #include <stdlib.h> | ||
77 | #include <string.h> | ||
78 | #include <unistd.h> | ||
79 | +#include <stdio.h> | ||
80 | #include <arpa/inet.h> | ||
81 | #include <netinet/in.h> | ||
82 | #include <sys/types.h> | ||
83 | Index: connman-1.30/configure.ac | ||
84 | =================================================================== | ||
85 | --- connman-1.30.orig/configure.ac | ||
86 | +++ connman-1.30/configure.ac | ||
87 | @@ -173,6 +173,8 @@ AM_CONDITIONAL(PPTP_BUILTIN, test "${ena | ||
88 | |||
89 | AC_CHECK_HEADERS([execinfo.h]) | ||
90 | |||
91 | +AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr], [], [], [[#include <netinet/in.h>]]) | ||
92 | + | ||
93 | AC_CHECK_HEADERS(resolv.h, dummy=yes, | ||
94 | AC_MSG_ERROR(resolver header files are required)) | ||
95 | AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [ | ||
96 | Index: connman-1.30/gdhcp/common.h | ||
97 | =================================================================== | ||
98 | --- connman-1.30.orig/gdhcp/common.h | ||
99 | +++ connman-1.30/gdhcp/common.h | ||
100 | @@ -19,6 +19,7 @@ | ||
101 | * | ||
102 | */ | ||
103 | |||
104 | +#include <config.h> | ||
105 | #include <netinet/udp.h> | ||
106 | #include <netinet/ip.h> | ||
107 | |||
108 | @@ -170,8 +171,8 @@ static const uint8_t dhcp_option_lengths | ||
109 | [OPTION_U32] = 4, | ||
110 | }; | ||
111 | |||
112 | -/* already defined within netinet/in.h if using GNU compiler */ | ||
113 | -#ifndef __USE_GNU | ||
114 | +/* already defined within netinet/in.h if using GNU or musl libc */ | ||
115 | +#ifndef HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR | ||
116 | struct in6_pktinfo { | ||
117 | struct in6_addr ipi6_addr; /* src/dst IPv6 address */ | ||
118 | unsigned int ipi6_ifindex; /* send/recv interface index */ | ||