Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/
Date: Thu, 01 Feb 2018 22:36:09
Message-Id: 1517524503.cd534eb17c94864a155a6e80b44f8b42ca90480b.vapier@gentoo
1 commit: cd534eb17c94864a155a6e80b44f8b42ca90480b
2 Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
3 AuthorDate: Thu Feb 1 22:35:03 2018 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 1 22:35:03 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd534eb1
7
8 sys-apps/iproute2: make libelf usage optional
9
10 This dep is only needed to load eBPF filters out of ELFs compiled
11 (usually) by LLVM's eBPF backend. There's no need to make this a
12 hard dep on everyone's system.
13
14 sys-apps/iproute2/iproute2-4.15.0.ebuild | 7 ++++---
15 sys-apps/iproute2/metadata.xml | 1 +
16 2 files changed, 5 insertions(+), 3 deletions(-)
17
18 diff --git a/sys-apps/iproute2/iproute2-4.15.0.ebuild b/sys-apps/iproute2/iproute2-4.15.0.ebuild
19 index f38e3db1ff8..15efa9acf6c 100644
20 --- a/sys-apps/iproute2/iproute2-4.15.0.ebuild
21 +++ b/sys-apps/iproute2/iproute2-4.15.0.ebuild
22 @@ -18,12 +18,13 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
23
24 LICENSE="GPL-2"
25 SLOT="0"
26 -IUSE="atm berkdb +iptables ipv6 minimal selinux"
27 +IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
28
29 # We could make libmnl optional, but it's tiny, so eh
30 RDEPEND="
31 !net-misc/arpd
32 - !minimal? ( net-libs/libmnl virtual/libelf )
33 + !minimal? ( net-libs/libmnl )
34 + elf? ( virtual/libelf )
35 iptables? ( >=net-firewall/iptables-1.4.20:= )
36 berkdb? ( sys-libs/db:= )
37 atm? ( net-dialup/linux-atm )
38 @@ -101,7 +102,7 @@ src_configure() {
39 TC_CONFIG_IPSET := y
40 HAVE_BERKELEY_DB := $(usex berkdb y n)
41 HAVE_MNL := $(usex minimal n y)
42 - HAVE_ELF := $(usex minimal n y)
43 + HAVE_ELF := $(usex elf y n)
44 HAVE_SELINUX := $(usex selinux y n)
45 IP_CONFIG_SETNS := ${setns}
46 # Use correct iptables dir, #144265 #293709
47
48 diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
49 index 2605d5fd7ce..ad652efcf7e 100644
50 --- a/sys-apps/iproute2/metadata.xml
51 +++ b/sys-apps/iproute2/metadata.xml
52 @@ -7,6 +7,7 @@
53 </maintainer>
54 <use>
55 <flag name="berkdb">build programs that use berkdb (just arpd)</flag>
56 + <flag name="elf">support loading eBPF programs from ELFs (e.g. LLVM's eBPF backend)</flag>
57 <flag name="iptables">include support for iptables filtering</flag>
58 <flag name="minimal">only install ip and tc programs, without eBPF support</flag>
59 </use>