summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-04-28 17:07:14 +0000
committerMike Frysinger <vapier@gentoo.org>2013-04-28 17:07:14 +0000
commite09ec5ba47e1c1bec991c26fb322cb49484835ec (patch)
tree8fa4164c8d93f8a9887751809bb45739ed7ed939 /sys-apps/iproute2
parentmedia-libs/gegl: Fix introspection version (bug #416587) (diff)
downloadgentoo-2-e09ec5ba47e1c1bec991c26fb322cb49484835ec.tar.gz
gentoo-2-e09ec5ba47e1c1bec991c26fb322cb49484835ec.tar.bz2
gentoo-2-e09ec5ba47e1c1bec991c26fb322cb49484835ec.zip
Fix building w/older linux-headers #467716 by Didier Barvaux.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-apps/iproute2')
-rw-r--r--sys-apps/iproute2/ChangeLog5
-rw-r--r--sys-apps/iproute2/iproute2-3.8.0.ebuild8
2 files changed, 10 insertions, 3 deletions
diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index f41e290eab02..a7d43990f7f7 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/iproute2
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.220 2013/04/27 09:57:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.221 2013/04/28 17:07:14 vapier Exp $
+
+ 28 Apr 2013; Mike Frysinger <vapier@gentoo.org> iproute2-3.8.0.ebuild:
+ Fix building w/older linux-headers #467716 by Didier Barvaux.
27 Apr 2013; Mike Frysinger <vapier@gentoo.org> iproute2-3.8.0.ebuild:
Do not bother installing sgml/tex source files as docs #455988 by C W Rose.
diff --git a/sys-apps/iproute2/iproute2-3.8.0.ebuild b/sys-apps/iproute2/iproute2-3.8.0.ebuild
index cafc8ebc786e..d9c1ec1ad03f 100644
--- a/sys-apps/iproute2/iproute2-3.8.0.ebuild
+++ b/sys-apps/iproute2/iproute2-3.8.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.8.0.ebuild,v 1.11 2013/04/27 09:57:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.8.0.ebuild,v 1.12 2013/04/28 17:07:14 vapier Exp $
EAPI="4"
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
@@ -101,6 +101,10 @@ src_install() {
dolib.a lib/libnetlink.a
insinto /usr/include
doins include/libnetlink.h
+ # This local header pulls in a lot of linux headers it
+ # doesn't directly need. Delete this header that requires
+ # linux-headers-3.8 until that goes stable. #467716
+ sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
if use berkdb ; then
dodir /var/lib/arpd