diff options
Diffstat (limited to 'meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch')
-rw-r--r-- | meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch | 69 |
1 files changed, 15 insertions, 54 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch b/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch index 763e374488..65291368bd 100644 --- a/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch +++ b/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 52a1e41d7541b2c936285844c59bd1be21797860 Mon Sep 17 00:00:00 2001 | 1 | From e50cdaed07e51f2508f94eb1f34fe43776e4ca78 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 May 2015 14:57:05 -0700 | 3 | Date: Fri, 29 May 2015 14:57:05 -0700 |
4 | Subject: [PATCH] Fix build with musl | 4 | Subject: [PATCH] Fix build with musl |
@@ -6,18 +6,16 @@ Subject: [PATCH] Fix build with musl | |||
6 | There are several assumption about glibc | 6 | There are several assumption about glibc |
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | --- | ||
10 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
11 | 10 | --- | |
12 | include/net/ppp_defs.h | 2 ++ | 11 | include/net/ppp_defs.h | 2 ++ |
13 | pppd/Makefile.linux | 2 +- | 12 | pppd/Makefile.linux | 2 +- |
14 | pppd/magic.h | 6 +++--- | 13 | pppd/plugins/rp-pppoe/config.h | 3 ++- |
15 | pppd/plugins/rp-pppoe/config.h | 5 ++++- | ||
16 | pppd/plugins/rp-pppoe/plugin.c | 1 - | 14 | pppd/plugins/rp-pppoe/plugin.c | 1 - |
17 | pppd/plugins/rp-pppoe/pppoe-discovery.c | 8 ++++---- | 15 | pppd/plugins/rp-pppoe/pppoe-discovery.c | 8 ++++---- |
18 | pppd/plugins/rp-pppoe/pppoe.h | 2 +- | 16 | pppd/plugins/rp-pppoe/pppoe.h | 2 +- |
19 | pppd/sys-linux.c | 3 ++- | 17 | pppd/sys-linux.c | 3 ++- |
20 | 8 files changed, 17 insertions(+), 12 deletions(-) | 18 | 7 files changed, 12 insertions(+), 9 deletions(-) |
21 | 19 | ||
22 | diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h | 20 | diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h |
23 | index b06eda5..dafa36c 100644 | 21 | index b06eda5..dafa36c 100644 |
@@ -33,11 +31,11 @@ index b06eda5..dafa36c 100644 | |||
33 | * The basic PPP frame. | 31 | * The basic PPP frame. |
34 | */ | 32 | */ |
35 | diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux | 33 | diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux |
36 | index 8ab2102..d7e2564 100644 | 34 | index 4e485a1..76411bc 100644 |
37 | --- a/pppd/Makefile.linux | 35 | --- a/pppd/Makefile.linux |
38 | +++ b/pppd/Makefile.linux | 36 | +++ b/pppd/Makefile.linux |
39 | @@ -126,7 +126,7 @@ LIBS += -lcrypt | 37 | @@ -131,7 +131,7 @@ LIBS += -lcrypt |
40 | #endif | 38 | endif |
41 | 39 | ||
42 | ifdef USE_LIBUTIL | 40 | ifdef USE_LIBUTIL |
43 | -CFLAGS += -DHAVE_LOGWTMP=1 | 41 | -CFLAGS += -DHAVE_LOGWTMP=1 |
@@ -45,24 +43,8 @@ index 8ab2102..d7e2564 100644 | |||
45 | LIBS += -lutil | 43 | LIBS += -lutil |
46 | endif | 44 | endif |
47 | 45 | ||
48 | diff --git a/pppd/magic.h b/pppd/magic.h | ||
49 | index c81213b..9d399e3 100644 | ||
50 | --- a/pppd/magic.h | ||
51 | +++ b/pppd/magic.h | ||
52 | @@ -42,8 +42,8 @@ | ||
53 | * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $ | ||
54 | */ | ||
55 | |||
56 | -void magic_init __P((void)); /* Initialize the magic number generator */ | ||
57 | -u_int32_t magic __P((void)); /* Returns the next magic number */ | ||
58 | +void magic_init (void); /* Initialize the magic number generator */ | ||
59 | +u_int32_t magic (void); /* Returns the next magic number */ | ||
60 | |||
61 | /* Fill buffer with random bytes */ | ||
62 | -void random_bytes __P((unsigned char *buf, int len)); | ||
63 | +void random_bytes (unsigned char *buf, int len); | ||
64 | diff --git a/pppd/plugins/rp-pppoe/config.h b/pppd/plugins/rp-pppoe/config.h | 46 | diff --git a/pppd/plugins/rp-pppoe/config.h b/pppd/plugins/rp-pppoe/config.h |
65 | index 5703087..fff032e 100644 | 47 | index a708859..4a16a88 100644 |
66 | --- a/pppd/plugins/rp-pppoe/config.h | 48 | --- a/pppd/plugins/rp-pppoe/config.h |
67 | +++ b/pppd/plugins/rp-pppoe/config.h | 49 | +++ b/pppd/plugins/rp-pppoe/config.h |
68 | @@ -78,8 +78,9 @@ | 50 | @@ -78,8 +78,9 @@ |
@@ -76,18 +58,8 @@ index 5703087..fff032e 100644 | |||
76 | /* Define if you have the <net/if.h> header file. */ | 58 | /* Define if you have the <net/if.h> header file. */ |
77 | #define HAVE_NET_IF_H 1 | 59 | #define HAVE_NET_IF_H 1 |
78 | 60 | ||
79 | @@ -102,7 +103,9 @@ | ||
80 | #define HAVE_NETPACKET_PACKET_H 1 | ||
81 | |||
82 | /* Define if you have the <sys/cdefs.h> header file. */ | ||
83 | +#ifdef __GLIBC__ | ||
84 | #define HAVE_SYS_CDEFS_H 1 | ||
85 | +#endif | ||
86 | |||
87 | /* Define if you have the <sys/dlpi.h> header file. */ | ||
88 | /* #undef HAVE_SYS_DLPI_H */ | ||
89 | diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c | 61 | diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c |
90 | index a8c2bb4..ca34d79 100644 | 62 | index 44e0c31..93c0906 100644 |
91 | --- a/pppd/plugins/rp-pppoe/plugin.c | 63 | --- a/pppd/plugins/rp-pppoe/plugin.c |
92 | +++ b/pppd/plugins/rp-pppoe/plugin.c | 64 | +++ b/pppd/plugins/rp-pppoe/plugin.c |
93 | @@ -46,7 +46,6 @@ static char const RCSID[] = | 65 | @@ -46,7 +46,6 @@ static char const RCSID[] = |
@@ -99,10 +71,10 @@ index a8c2bb4..ca34d79 100644 | |||
99 | #include <linux/ppp_defs.h> | 71 | #include <linux/ppp_defs.h> |
100 | #include <linux/if_pppox.h> | 72 | #include <linux/if_pppox.h> |
101 | diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c | 73 | diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c |
102 | index 3d3bf4e..d42f619 100644 | 74 | index f19c6d8..f45df2c 100644 |
103 | --- a/pppd/plugins/rp-pppoe/pppoe-discovery.c | 75 | --- a/pppd/plugins/rp-pppoe/pppoe-discovery.c |
104 | +++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c | 76 | +++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c |
105 | @@ -27,10 +27,6 @@ | 77 | @@ -29,10 +29,6 @@ |
106 | #include <linux/if_packet.h> | 78 | #include <linux/if_packet.h> |
107 | #endif | 79 | #endif |
108 | 80 | ||
@@ -113,22 +85,11 @@ index 3d3bf4e..d42f619 100644 | |||
113 | #ifdef HAVE_ASM_TYPES_H | 85 | #ifdef HAVE_ASM_TYPES_H |
114 | #include <asm/types.h> | 86 | #include <asm/types.h> |
115 | #endif | 87 | #endif |
116 | @@ -47,6 +43,10 @@ | ||
117 | #include <net/if_arp.h> | ||
118 | #endif | ||
119 | |||
120 | +#ifndef __GLIBC__ | ||
121 | +#define error(x...) fprintf(stderr, x) | ||
122 | +#endif | ||
123 | + | ||
124 | char *xstrdup(const char *s); | ||
125 | void usage(void); | ||
126 | |||
127 | diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h | 88 | diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h |
128 | index 9ab2eee..75b9004 100644 | 89 | index a4e7d5c..de191c8 100644 |
129 | --- a/pppd/plugins/rp-pppoe/pppoe.h | 90 | --- a/pppd/plugins/rp-pppoe/pppoe.h |
130 | +++ b/pppd/plugins/rp-pppoe/pppoe.h | 91 | +++ b/pppd/plugins/rp-pppoe/pppoe.h |
131 | @@ -92,7 +92,7 @@ typedef unsigned long UINT32_t; | 92 | @@ -90,7 +90,7 @@ typedef unsigned long UINT32_t; |
132 | #ifdef HAVE_SYS_SOCKET_H | 93 | #ifdef HAVE_SYS_SOCKET_H |
133 | #include <sys/socket.h> | 94 | #include <sys/socket.h> |
134 | #endif | 95 | #endif |
@@ -138,7 +99,7 @@ index 9ab2eee..75b9004 100644 | |||
138 | #endif | 99 | #endif |
139 | #endif | 100 | #endif |
140 | diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c | 101 | diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c |
141 | index a105505..49b0273 100644 | 102 | index a0531e9..84ee394 100644 |
142 | --- a/pppd/sys-linux.c | 103 | --- a/pppd/sys-linux.c |
143 | +++ b/pppd/sys-linux.c | 104 | +++ b/pppd/sys-linux.c |
144 | @@ -112,7 +112,7 @@ | 105 | @@ -112,7 +112,7 @@ |
@@ -159,5 +120,5 @@ index a105505..49b0273 100644 | |||
159 | /* | 120 | /* |
160 | * This is in linux/include/net/ipv6.h. | 121 | * This is in linux/include/net/ipv6.h. |
161 | -- | 122 | -- |
162 | 2.1.4 | 123 | 2.17.1 |
163 | 124 | ||