From 035567b2793f3649e2ddc6cd34b75dd643f47d73 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 20 Oct 2016 22:57:11 +0200 Subject: [PATCH] pppd: fix build with Linux 4.8 headers This commit fixes the build of pppd with toolchain using Linux 4.8 headers. The patch has been taken from a pull request pending on the Github project, which is unfortunately somewhat dead. The fix is not the most beautiful one, but it does the job, in a piece of source code that's anyway rather messy in terms of mixing userspace headers and kernel headers. Fixes: http://autobuild.buildroot.net/results/bdc4f274e527c5aebf9bd1b2ca85ba8e7da57e9d/ and numerous similar other build failures Signed-off-by: Thomas Petazzoni --- .../0001-fix-building-with-linux-4.8.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/pppd/0001-fix-building-with-linux-4.8.patch diff --git a/package/pppd/0001-fix-building-with-linux-4.8.patch b/package/pppd/0001-fix-building-with-linux-4.8.patch new file mode 100644 index 0000000000..d09e39291b --- /dev/null +++ b/package/pppd/0001-fix-building-with-linux-4.8.patch @@ -0,0 +1,39 @@ +From 492e240a651e3d32b84cac66e4675ee99dcbe05a Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Thu, 13 Oct 2016 13:41:43 +0800 +Subject: [PATCH] ppp: fix building with linux-4.8 + +Fix a build error when using the linux-4.8 headers that results in: + +In file included from pppoe.h:87:0, + from plugin.c:29: +../usr/include/netinet/in.h:211:8: note: originally defined here + struct in6_addr + ^~~~~~~~ +In file included from ../usr/include/linux/if_pppol2tp.h:20:0, + from ../usr/include/linux/if_pppox.h:26, + from plugin.c:52: +../usr/include/linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6' + struct sockaddr_in6 { + ^~~~~~~~~~~~ + +Signed-off-by: Jackie Huang +[Thomas: downloaded from https://github.com/paulusmack/ppp/pull/69.] +Signed-off-by: Thomas Petazzoni +--- + pppd/plugins/rp-pppoe/pppoe.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h +index 9ab2eee..96d2794 100644 +--- a/pppd/plugins/rp-pppoe/pppoe.h ++++ b/pppd/plugins/rp-pppoe/pppoe.h +@@ -84,7 +84,7 @@ typedef unsigned long UINT32_t; + #include + #endif + +-#include ++#include + + #ifdef HAVE_NETINET_IF_ETHER_H + #include -- 2.30.2