diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-11-22 02:56:13 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-11-22 02:56:13 +0000 |
| commit | 17027cf65b76d3e6abc664259b945d248833e9db (patch) | |
| tree | d193b5f469ea2a0501451da308322c07d20d13b9 /net-dialup | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-17027cf65b76d3e6abc664259b945d248833e9db.tar.gz gentoo-2-17027cf65b76d3e6abc664259b945d248833e9db.tar.bz2 gentoo-2-17027cf65b76d3e6abc664259b945d248833e9db.zip | |
Fix building with linux-headers-2.6.35 #334197, and fix missing SA_RESTART build error.
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'net-dialup')
| -rw-r--r-- | net-dialup/rp-pppoe/ChangeLog | 9 | ||||
| -rw-r--r-- | net-dialup/rp-pppoe/files/rp-pppoe-3.10-posix-source-sigaction.patch | 18 | ||||
| -rw-r--r-- | net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild | 11 |
3 files changed, 30 insertions, 8 deletions
diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog index 3b0a75c877a0..a38e8cc8bdf4 100644 --- a/net-dialup/rp-pppoe/ChangeLog +++ b/net-dialup/rp-pppoe/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-dialup/rp-pppoe -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.101 2008/09/10 20:56:43 mrness Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.102 2010/11/22 02:56:12 vapier Exp $ + + 22 Nov 2010; Mike Frysinger <vapier@gentoo.org> rp-pppoe-3.10-r1.ebuild, + +files/rp-pppoe-3.10-posix-source-sigaction.patch: + Fix building with linux-headers-2.6.35 #334197, and fix missing SA_RESTART + build error. 10 Sep 2008; Alin Năstac <mrness@gentoo.org> files/rp-pppoe-3.10-autotools.patch: diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-posix-source-sigaction.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-posix-source-sigaction.patch new file mode 100644 index 000000000000..bd19170a99c5 --- /dev/null +++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-posix-source-sigaction.patch @@ -0,0 +1,18 @@ +glibc does not define SA_RESTART when _POSIX_SOURCE is defined, so we +have to just assume the default signal.h include defines SA_RESTART + +http://sourceware.org/bugzilla/show_bug.cgi?id=12252 + +--- rp-pppoe-3.10/src/pppoe.h ++++ rp-pppoe-3.10/src/pppoe.h +@@ -19,10 +19,6 @@ + + extern int IsSetID; + +-#if defined(HAVE_NETPACKET_PACKET_H) || defined(HAVE_LINUX_IF_PACKET_H) +-#define _POSIX_SOURCE 1 /* For sigaction defines */ +-#endif +- + #include <stdio.h> /* For FILE */ + #include <sys/types.h> /* For pid_t */ + diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild index efa00d1034aa..e857e1bba1b2 100644 --- a/net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild +++ b/net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild @@ -1,9 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild,v 1.1 2008/08/23 03:52:46 mrness Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" +# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild,v 1.2 2010/11/22 02:56:12 vapier Exp $ inherit eutils flag-o-matic autotools @@ -34,7 +31,9 @@ src_unpack() { epatch "${FILESDIR}/${P}-plugin-options.patch" epatch "${FILESDIR}/${P}-autotools.patch" epatch "${FILESDIR}/${P}-session-offset.patch" # bug 204476 - epatch "${FILESDIR}/${P}-linux-headers.patch" + has_version '<sys-kernel/linux-headers-2.6.35' && \ + epatch "${FILESDIR}/${P}-linux-headers.patch" #334197 + epatch "${FILESDIR}/${P}-posix-source-sigaction.patch" cd "${S}"/src eautoreconf |