diff options
author | Alin Năstac <mrness@gentoo.org> | 2007-04-13 22:31:54 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2007-04-13 22:31:54 +0000 |
commit | a365f97ca28479c570d418c91a7d66eb2ca4b6c5 (patch) | |
tree | da2d3901db23808af4f049d752b07ed3e0dd796e /net-dialup/linux-atm | |
parent | version bump thanks to flameeyes in bug 174003 (diff) | |
download | gentoo-2-a365f97ca28479c570d418c91a7d66eb2ca4b6c5.tar.gz gentoo-2-a365f97ca28479c570d418c91a7d66eb2ca4b6c5.tar.bz2 gentoo-2-a365f97ca28479c570d418c91a7d66eb2ca4b6c5.zip |
Fix compilation error when build against linux-headers-2.6.17-r2 (#160381)
(Portage version: 2.1.2.2)
Diffstat (limited to 'net-dialup/linux-atm')
-rw-r--r-- | net-dialup/linux-atm/ChangeLog | 6 | ||||
-rw-r--r-- | net-dialup/linux-atm/files/2.4.1-linux-if.patch | 12 | ||||
-rw-r--r-- | net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild | 4 |
3 files changed, 20 insertions, 2 deletions
diff --git a/net-dialup/linux-atm/ChangeLog b/net-dialup/linux-atm/ChangeLog index cfb6d9e42582..bab24ab54bda 100644 --- a/net-dialup/linux-atm/ChangeLog +++ b/net-dialup/linux-atm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dialup/linux-atm # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/ChangeLog,v 1.20 2007/01/03 16:58:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/ChangeLog,v 1.21 2007/04/13 22:31:53 mrness Exp $ + + 13 Apr 2007; Alin Năstac <mrness@gentoo.org> +files/2.4.1-linux-if.patch, + linux-atm-2.4.1-r1.ebuild: + Fix compilation error when build against linux-headers-2.6.17-r2 (#160381). 03 Jan 2007; Mike Frysinger <vapier@gentoo.org> linux-atm-2.4.1-r1.ebuild: Fix building with sanitized linux-headers #159823 by Emanuele Tamponi. diff --git a/net-dialup/linux-atm/files/2.4.1-linux-if.patch b/net-dialup/linux-atm/files/2.4.1-linux-if.patch new file mode 100644 index 000000000000..fcc2f8a52231 --- /dev/null +++ b/net-dialup/linux-atm/files/2.4.1-linux-if.patch @@ -0,0 +1,12 @@ +diff -Nru linux-atm-2.4.1.orig/src/arpd/io.c linux-atm-2.4.1/src/arpd/io.c +--- linux-atm-2.4.1.orig/src/arpd/io.c 2007-04-13 23:50:25.000000000 +0300 ++++ linux-atm-2.4.1/src/arpd/io.c 2007-04-13 23:30:28.000000000 +0300 +@@ -16,7 +16,7 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/ioctl.h> +-#include <net/if.h> ++#include <linux/if.h> + #include <netinet/in.h> + #include <atm.h> + #include <linux/atmclip.h> /* for CLIP_DEFAULT_IDLETIMER */ diff --git a/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild b/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild index 87ca83c84b5e..34d9a93b6eef 100644 --- a/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild +++ b/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild,v 1.15 2007/01/03 16:58:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/linux-atm/linux-atm-2.4.1-r1.ebuild,v 1.16 2007/04/13 22:31:53 mrness Exp $ inherit eutils libtool @@ -29,6 +29,8 @@ src_unpack() { # Fedora patch: include stdlib.h for strtol prototype in sigd/cfg_y.y epatch "${FILESDIR}"/${PV}-stdlib.patch + epatch "${FILESDIR}"/${PV}-linux-if.patch + sed -i '/#define _LINUX_NETDEVICE_H/d' src/arpd/*.c || die sed -i 's:cp hosts.atm /etc:cp hosts.atm ${DESTDIR}/etc:' src/config/Makefile.in || die "sed operation on Makefile failed" |