summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-12-15 21:27:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:26 +0000
commit87c3e9855aa00866ba449b79bb215d9956b9a40b (patch)
tree1b2899aa00a37ab0f015b1d66ae5c43acd6fd3c9
parentcc55fc78fb96c04a626bbac4bde3c90c27c11297 (diff)
downloadpoky-87c3e9855aa00866ba449b79bb215d9956b9a40b.tar.gz
connman: include config.h for HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR
We now check at configure time of libc has pktinfo struct (From OE-Core rev: bf8559bc78853c3d8d3470967debb9241e726442) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman/0003-Fix-header-inclusions-for-musl.patch79
1 files changed, 56 insertions, 23 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
index 6327aa2cbd..eefc6834b7 100644
--- 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
@@ -14,10 +14,10 @@ Upstream-Status: Pending
14 tools/dnsproxy-test.c | 1 + 14 tools/dnsproxy-test.c | 1 +
15 5 files changed, 3 insertions(+), 5 deletions(-) 15 5 files changed, 3 insertions(+), 5 deletions(-)
16 16
17diff --git a/gweb/gresolv.c b/gweb/gresolv.c 17Index: connman-1.30/gweb/gresolv.c
18index 3ad8e70..61d6fe8 100644 18===================================================================
19--- a/gweb/gresolv.c 19--- connman-1.30.orig/gweb/gresolv.c
20+++ b/gweb/gresolv.c 20+++ connman-1.30/gweb/gresolv.c
21@@ -28,6 +28,7 @@ 21@@ -28,6 +28,7 @@
22 #include <stdarg.h> 22 #include <stdarg.h>
23 #include <string.h> 23 #include <string.h>
@@ -26,10 +26,10 @@ index 3ad8e70..61d6fe8 100644
26 #include <resolv.h> 26 #include <resolv.h>
27 #include <sys/types.h> 27 #include <sys/types.h>
28 #include <sys/socket.h> 28 #include <sys/socket.h>
29diff --git a/plugins/wifi.c b/plugins/wifi.c 29Index: connman-1.30/plugins/wifi.c
30index dfe849f..99cff3f 100644 30===================================================================
31--- a/plugins/wifi.c 31--- connman-1.30.orig/plugins/wifi.c
32+++ b/plugins/wifi.c 32+++ connman-1.30/plugins/wifi.c
33@@ -30,9 +30,8 @@ 33@@ -30,9 +30,8 @@
34 #include <string.h> 34 #include <string.h>
35 #include <sys/ioctl.h> 35 #include <sys/ioctl.h>
@@ -41,10 +41,10 @@ index dfe849f..99cff3f 100644
41 41
42 #ifndef IFF_LOWER_UP 42 #ifndef IFF_LOWER_UP
43 #define IFF_LOWER_UP 0x10000 43 #define IFF_LOWER_UP 0x10000
44diff --git a/src/tethering.c b/src/tethering.c 44Index: connman-1.30/src/tethering.c
45index ceeec74..c44cb36 100644 45===================================================================
46--- a/src/tethering.c 46--- connman-1.30.orig/src/tethering.c
47+++ b/src/tethering.c 47+++ connman-1.30/src/tethering.c
48@@ -31,10 +31,8 @@ 48@@ -31,10 +31,8 @@
49 #include <stdio.h> 49 #include <stdio.h>
50 #include <sys/ioctl.h> 50 #include <sys/ioctl.h>
@@ -56,10 +56,10 @@ index ceeec74..c44cb36 100644
56 #include <netinet/in.h> 56 #include <netinet/in.h>
57 #include <linux/if_bridge.h> 57 #include <linux/if_bridge.h>
58 58
59diff --git a/tools/dhcp-test.c b/tools/dhcp-test.c 59Index: connman-1.30/tools/dhcp-test.c
60index c34e10a..eae66fc 100644 60===================================================================
61--- a/tools/dhcp-test.c 61--- connman-1.30.orig/tools/dhcp-test.c
62+++ b/tools/dhcp-test.c 62+++ connman-1.30/tools/dhcp-test.c
63@@ -33,7 +33,6 @@ 63@@ -33,7 +33,6 @@
64 #include <arpa/inet.h> 64 #include <arpa/inet.h>
65 #include <net/route.h> 65 #include <net/route.h>
@@ -68,10 +68,10 @@ index c34e10a..eae66fc 100644
68 68
69 #include <gdhcp/gdhcp.h> 69 #include <gdhcp/gdhcp.h>
70 70
71diff --git a/tools/dnsproxy-test.c b/tools/dnsproxy-test.c 71Index: connman-1.30/tools/dnsproxy-test.c
72index 551cae9..226ba86 100644 72===================================================================
73--- a/tools/dnsproxy-test.c 73--- connman-1.30.orig/tools/dnsproxy-test.c
74+++ b/tools/dnsproxy-test.c 74+++ connman-1.30/tools/dnsproxy-test.c
75@@ -27,6 +27,7 @@ 75@@ -27,6 +27,7 @@
76 #include <stdlib.h> 76 #include <stdlib.h>
77 #include <string.h> 77 #include <string.h>
@@ -80,6 +80,39 @@ index 551cae9..226ba86 100644
80 #include <arpa/inet.h> 80 #include <arpa/inet.h>
81 #include <netinet/in.h> 81 #include <netinet/in.h>
82 #include <sys/types.h> 82 #include <sys/types.h>
83-- 83Index: connman-1.30/configure.ac
842.5.1 84===================================================================
85 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, [
96Index: 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 */