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 @@ -From 52a1e41d7541b2c936285844c59bd1be21797860 Mon Sep 17 00:00:00 2001 +From e50cdaed07e51f2508f94eb1f34fe43776e4ca78 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 May 2015 14:57:05 -0700 Subject: [PATCH] Fix build with musl @@ -6,18 +6,16 @@ Subject: [PATCH] Fix build with musl There are several assumption about glibc Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Pending - +--- include/net/ppp_defs.h | 2 ++ pppd/Makefile.linux | 2 +- - pppd/magic.h | 6 +++--- - pppd/plugins/rp-pppoe/config.h | 5 ++++- + pppd/plugins/rp-pppoe/config.h | 3 ++- pppd/plugins/rp-pppoe/plugin.c | 1 - pppd/plugins/rp-pppoe/pppoe-discovery.c | 8 ++++---- pppd/plugins/rp-pppoe/pppoe.h | 2 +- pppd/sys-linux.c | 3 ++- - 8 files changed, 17 insertions(+), 12 deletions(-) + 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h index b06eda5..dafa36c 100644 @@ -33,11 +31,11 @@ index b06eda5..dafa36c 100644 * The basic PPP frame. */ diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index 8ab2102..d7e2564 100644 +index 4e485a1..76411bc 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux -@@ -126,7 +126,7 @@ LIBS += -lcrypt - #endif +@@ -131,7 +131,7 @@ LIBS += -lcrypt + endif ifdef USE_LIBUTIL -CFLAGS += -DHAVE_LOGWTMP=1 @@ -45,24 +43,8 @@ index 8ab2102..d7e2564 100644 LIBS += -lutil endif -diff --git a/pppd/magic.h b/pppd/magic.h -index c81213b..9d399e3 100644 ---- a/pppd/magic.h -+++ b/pppd/magic.h -@@ -42,8 +42,8 @@ - * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $ - */ - --void magic_init __P((void)); /* Initialize the magic number generator */ --u_int32_t magic __P((void)); /* Returns the next magic number */ -+void magic_init (void); /* Initialize the magic number generator */ -+u_int32_t magic (void); /* Returns the next magic number */ - - /* Fill buffer with random bytes */ --void random_bytes __P((unsigned char *buf, int len)); -+void random_bytes (unsigned char *buf, int len); diff --git a/pppd/plugins/rp-pppoe/config.h b/pppd/plugins/rp-pppoe/config.h -index 5703087..fff032e 100644 +index a708859..4a16a88 100644 --- a/pppd/plugins/rp-pppoe/config.h +++ b/pppd/plugins/rp-pppoe/config.h @@ -78,8 +78,9 @@ @@ -76,18 +58,8 @@ index 5703087..fff032e 100644 /* Define if you have the <net/if.h> header file. */ #define HAVE_NET_IF_H 1 -@@ -102,7 +103,9 @@ - #define HAVE_NETPACKET_PACKET_H 1 - - /* Define if you have the <sys/cdefs.h> header file. */ -+#ifdef __GLIBC__ - #define HAVE_SYS_CDEFS_H 1 -+#endif - - /* Define if you have the <sys/dlpi.h> header file. */ - /* #undef HAVE_SYS_DLPI_H */ diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c -index a8c2bb4..ca34d79 100644 +index 44e0c31..93c0906 100644 --- a/pppd/plugins/rp-pppoe/plugin.c +++ b/pppd/plugins/rp-pppoe/plugin.c @@ -46,7 +46,6 @@ static char const RCSID[] = @@ -99,10 +71,10 @@ index a8c2bb4..ca34d79 100644 #include <linux/ppp_defs.h> #include <linux/if_pppox.h> diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c -index 3d3bf4e..d42f619 100644 +index f19c6d8..f45df2c 100644 --- a/pppd/plugins/rp-pppoe/pppoe-discovery.c +++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c -@@ -27,10 +27,6 @@ +@@ -29,10 +29,6 @@ #include <linux/if_packet.h> #endif @@ -113,22 +85,11 @@ index 3d3bf4e..d42f619 100644 #ifdef HAVE_ASM_TYPES_H #include <asm/types.h> #endif -@@ -47,6 +43,10 @@ - #include <net/if_arp.h> - #endif - -+#ifndef __GLIBC__ -+#define error(x...) fprintf(stderr, x) -+#endif -+ - char *xstrdup(const char *s); - void usage(void); - diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..75b9004 100644 +index a4e7d5c..de191c8 100644 --- a/pppd/plugins/rp-pppoe/pppoe.h +++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -92,7 +92,7 @@ typedef unsigned long UINT32_t; +@@ -90,7 +90,7 @@ typedef unsigned long UINT32_t; #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -138,7 +99,7 @@ index 9ab2eee..75b9004 100644 #endif #endif diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c -index a105505..49b0273 100644 +index a0531e9..84ee394 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -112,7 +112,7 @@ @@ -159,5 +120,5 @@ index a105505..49b0273 100644 /* * This is in linux/include/net/ipv6.h. -- -2.1.4 +2.17.1 |