Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 1 | From e50cdaed07e51f2508f94eb1f34fe43776e4ca78 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 29 May 2015 14:57:05 -0700 |
| 4 | Subject: [PATCH] Fix build with musl |
| 5 | |
| 6 | There are several assumption about glibc |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | Upstream-Status: Pending |
| 10 | --- |
| 11 | include/net/ppp_defs.h | 2 ++ |
| 12 | pppd/Makefile.linux | 2 +- |
| 13 | pppd/plugins/rp-pppoe/config.h | 3 ++- |
| 14 | pppd/plugins/rp-pppoe/plugin.c | 1 - |
| 15 | pppd/plugins/rp-pppoe/pppoe-discovery.c | 8 ++++---- |
| 16 | pppd/plugins/rp-pppoe/pppoe.h | 2 +- |
| 17 | pppd/sys-linux.c | 3 ++- |
| 18 | 7 files changed, 12 insertions(+), 9 deletions(-) |
| 19 | |
| 20 | diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h |
| 21 | index b06eda5..dafa36c 100644 |
| 22 | --- a/include/net/ppp_defs.h |
| 23 | +++ b/include/net/ppp_defs.h |
| 24 | @@ -38,6 +38,8 @@ |
| 25 | #ifndef _PPP_DEFS_H_ |
| 26 | #define _PPP_DEFS_H_ |
| 27 | |
| 28 | +#include <sys/time.h> |
| 29 | + |
| 30 | /* |
| 31 | * The basic PPP frame. |
| 32 | */ |
| 33 | diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux |
| 34 | index 4e485a1..76411bc 100644 |
| 35 | --- a/pppd/Makefile.linux |
| 36 | +++ b/pppd/Makefile.linux |
| 37 | @@ -131,7 +131,7 @@ LIBS += -lcrypt |
| 38 | endif |
| 39 | |
| 40 | ifdef USE_LIBUTIL |
| 41 | -CFLAGS += -DHAVE_LOGWTMP=1 |
| 42 | +#CFLAGS += -DHAVE_LOGWTMP=1 |
| 43 | LIBS += -lutil |
| 44 | endif |
| 45 | |
| 46 | diff --git a/pppd/plugins/rp-pppoe/config.h b/pppd/plugins/rp-pppoe/config.h |
| 47 | index a708859..4a16a88 100644 |
| 48 | --- a/pppd/plugins/rp-pppoe/config.h |
| 49 | +++ b/pppd/plugins/rp-pppoe/config.h |
| 50 | @@ -78,8 +78,9 @@ |
| 51 | #define HAVE_NET_IF_ARP_H 1 |
| 52 | |
| 53 | /* Define if you have the <net/ethernet.h> header file. */ |
| 54 | +#ifdef __GLIBC__ |
| 55 | #define HAVE_NET_ETHERNET_H 1 |
| 56 | - |
| 57 | +#endif |
| 58 | /* Define if you have the <net/if.h> header file. */ |
| 59 | #define HAVE_NET_IF_H 1 |
| 60 | |
| 61 | diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c |
| 62 | index 44e0c31..93c0906 100644 |
| 63 | --- a/pppd/plugins/rp-pppoe/plugin.c |
| 64 | +++ b/pppd/plugins/rp-pppoe/plugin.c |
| 65 | @@ -46,7 +46,6 @@ static char const RCSID[] = |
| 66 | #include <unistd.h> |
| 67 | #include <fcntl.h> |
| 68 | #include <signal.h> |
| 69 | -#include <net/ethernet.h> |
| 70 | #include <net/if_arp.h> |
| 71 | #include <linux/ppp_defs.h> |
| 72 | #include <linux/if_pppox.h> |
| 73 | diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c |
| 74 | index f19c6d8..f45df2c 100644 |
| 75 | --- a/pppd/plugins/rp-pppoe/pppoe-discovery.c |
| 76 | +++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c |
| 77 | @@ -29,10 +29,6 @@ |
| 78 | #include <linux/if_packet.h> |
| 79 | #endif |
| 80 | |
| 81 | -#ifdef HAVE_NET_ETHERNET_H |
| 82 | -#include <net/ethernet.h> |
| 83 | -#endif |
| 84 | - |
| 85 | #ifdef HAVE_ASM_TYPES_H |
| 86 | #include <asm/types.h> |
| 87 | #endif |
| 88 | diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h |
| 89 | index a4e7d5c..de191c8 100644 |
| 90 | --- a/pppd/plugins/rp-pppoe/pppoe.h |
| 91 | +++ b/pppd/plugins/rp-pppoe/pppoe.h |
| 92 | @@ -90,7 +90,7 @@ typedef unsigned long UINT32_t; |
| 93 | #ifdef HAVE_SYS_SOCKET_H |
| 94 | #include <sys/socket.h> |
| 95 | #endif |
| 96 | -#ifndef HAVE_SYS_DLPI_H |
| 97 | +#if !defined HAVE_SYS_DLPI_H && defined HAVE_NET_ETHERNET_H |
| 98 | #include <netinet/if_ether.h> |
| 99 | #endif |
| 100 | #endif |
| 101 | diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c |
| 102 | index a0531e9..84ee394 100644 |
| 103 | --- a/pppd/sys-linux.c |
| 104 | +++ b/pppd/sys-linux.c |
| 105 | @@ -112,7 +112,7 @@ |
| 106 | #include <linux/types.h> |
| 107 | #include <linux/if.h> |
| 108 | #include <linux/if_arp.h> |
| 109 | -#include <linux/route.h> |
| 110 | +/* #include <linux/route.h> */ |
| 111 | #include <linux/if_ether.h> |
| 112 | #endif |
| 113 | #include <netinet/in.h> |
| 114 | @@ -145,6 +145,7 @@ |
| 115 | #endif |
| 116 | |
| 117 | #ifdef INET6 |
| 118 | +#include <net/route.h> |
| 119 | #ifndef _LINUX_IN6_H |
| 120 | /* |
| 121 | * This is in linux/include/net/ipv6.h. |
| 122 | -- |
| 123 | 2.17.1 |
| 124 | |