diff options
author | Mike Frysinger <vapier@gentoo.org> | 2012-01-06 23:16:38 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2012-01-06 23:16:38 +0000 |
commit | e6b5187b0ebe158d65f6b97de56643a1a51a86d8 (patch) | |
tree | ffce0613caaa1970fa8c16ac88b3c69e107f61ec /net-firewall/iptables | |
parent | Simplify ebuild a bit, and make sure we respect $CC #397871 by Agostino Sarubbo. (diff) | |
download | gentoo-2-e6b5187b0ebe158d65f6b97de56643a1a51a86d8.tar.gz gentoo-2-e6b5187b0ebe158d65f6b97de56643a1a51a86d8.tar.bz2 gentoo-2-e6b5187b0ebe158d65f6b97de56643a1a51a86d8.zip |
Trim core kernel headers from source to fix building with newer kernel headers (3.2+).
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'net-firewall/iptables')
-rw-r--r-- | net-firewall/iptables/ChangeLog | 6 | ||||
-rw-r--r-- | net-firewall/iptables/iptables-1.4.12.1-r1.ebuild | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog index 742b0e940759..d1d9533fb4a7 100644 --- a/net-firewall/iptables/ChangeLog +++ b/net-firewall/iptables/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/iptables # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.258 2012/01/02 00:08:34 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.259 2012/01/06 23:16:38 vapier Exp $ + + 06 Jan 2012; Mike Frysinger <vapier@gentoo.org> iptables-1.4.12.1-r1.ebuild: + Trim core kernel headers from source to fix building with newer kernel + headers (3.2+). 02 Jan 2012; Agostino Sarubbo <ago@gentoo.org> iptables-1.4.12.1-r1.ebuild: Fix typo in src_configure by Franz Siegfried Metz in bug #396737 diff --git a/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild b/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild index 5eab25c7d5f1..328643cb7ae3 100644 --- a/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild +++ b/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.3 2012/01/02 00:08:34 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.4 2012/01/06 23:16:38 vapier Exp $ EAPI="4" @@ -32,13 +32,16 @@ src_prepare() { "${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch" eautomake + # use the saner headers from the kernel + rm -f include/linux/{kernel,types}.h + # Only run autotools if user patched something epatch_user && eautoreconf || elibtoolize } src_configure() { sed -i \ - -e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \ + -e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \ configure || die econf \ --sbindir=/sbin \ |