public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/, net-dialup/rp-pppoe/files/
Date: Fri, 11 Nov 2016 20:13:01 +0000 (UTC)	[thread overview]
Message-ID: <1478895151.a8f9980e70713039baa28f2ba7dd9c67b6cffda9.vapier@gentoo> (raw)

commit:     a8f9980e70713039baa28f2ba7dd9c67b6cffda9
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 19:27:33 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 20:12:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f9980e

net-dialup/rp-pppoe: fix build w/linux-headers-4.8+

 .../files/rp-pppoe-3.12-linux-headers.patch        | 28 ++++++++++++++++++++++
 net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild           |  1 +
 2 files changed, 29 insertions(+)

diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.12-linux-headers.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.12-linux-headers.patch
new file mode 100644
index 00000000..961eba3
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.12-linux-headers.patch
@@ -0,0 +1,28 @@
+the linux headers have started adding shims to not define types or structs
+when C lib headers are active, but in order to work, the C lib headers have
+to be included before the linux headers.
+
+move the netinet/in.h include up above the linux/ includes.
+
+Mike Frysinger <vapier@gentoo.org>
+
+--- a/src/pppoe.h
++++ b/src/pppoe.h
+@@ -47,6 +47,8 @@
+ #include <sys/socket.h>
+ #endif
+ 
++#include <netinet/in.h>
++
+ /* Ugly header files on some Linux boxes... */
+ #if defined(HAVE_LINUX_IF_H)
+ #include <linux/if.h>
+@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t;
+ #include <linux/if_ether.h>
+ #endif
+ 
+-#include <netinet/in.h>
+-
+ #ifdef HAVE_NETINET_IF_ETHER_H
+ #include <sys/types.h>
+ 

diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild
index addecd9..4739e1f 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild
@@ -48,6 +48,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.10-posix-source-sigaction.patch"
 	epatch "${FILESDIR}/${PN}-3.11-gentoo.patch"
 	epatch "${FILESDIR}/${PN}-3.11-kmode.patch" #364941
+	epatch "${FILESDIR}/${PN}-3.12-linux-headers.patch"
 
 	epatch_user
 


             reply	other threads:[~2016-11-11 20:13 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-11 20:13 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-19  1:23 [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/, net-dialup/rp-pppoe/files/ Mike Gilbert
2023-05-13  3:31 Sam James
2018-11-28 12:16 Lars Wendler
2016-12-11 21:15 Lars Wendler
2016-07-19 12:04 Lars Wendler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1478895151.a8f9980e70713039baa28f2ba7dd9c67b6cffda9.vapier@gentoo \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox