From: Eneas U de Queiroz <redacted>
Date: Wed, 23 May 2018 17:24:35 +0000 (-0300)
Subject: rp-pppoe: Fixed compilation with glibc
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=0c995cabe7d1e8d6e695772848d1d54f0e978bf9;p=openwrt-packages.git

rp-pppoe: Fixed compilation with glibc

Do not inlcude <netinet/in.h> when using glibc to avoid various
redefinitions.

Signed-off-by: Eneas U de Queiroz <redacted>
---

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 49a2c742a..3d6726b40 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rp-pppoe
 PKG_VERSION:=3.12
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_MAINTAINER:=Daniel Dickinson <lede@cshore.thecshore.com>
 PKG_LICENSE:=LGPL-2.0+
 
diff --git a/net/rp-pppoe/patches/140-glibc-avoid-include-linux_in.h.patch b/net/rp-pppoe/patches/140-glibc-avoid-include-linux_in.h.patch
new file mode 100644
index 000000000..0a766f97e
--- /dev/null
+++ b/net/rp-pppoe/patches/140-glibc-avoid-include-linux_in.h.patch
@@ -0,0 +1,12 @@
+--- a/src/pppoe.h
++++ b/src/pppoe.h
+@@ -131,7 +131,9 @@ typedef unsigned long UINT32_t;
+ #include <linux/if_ether.h>
+ #endif
+ 
++#ifndef __GLIBC__
+ #include <netinet/in.h>
++#endif
+ 
+ #ifdef HAVE_NETINET_IF_ETHER_H
+ #include <sys/types.h>