Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/iproute2/
Date: Wed, 01 Sep 2021 07:17:37
Message-Id: 1630480646.3de85ace798d0d7db3b3513653530488d14ecebe.polynomial-c@gentoo
1 commit: 3de85ace798d0d7db3b3513653530488d14ecebe
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 1 07:14:19 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 1 07:17:26 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de85ace
7
8 sys-apps/iproute2: Synced live ebuild
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 sys-apps/iproute2/iproute2-9999.ebuild | 9 +++++++--
13 1 file changed, 7 insertions(+), 2 deletions(-)
14
15 diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
16 index 14d225e3e58..367b3541cbf 100644
17 --- a/sys-apps/iproute2/iproute2-9999.ebuild
18 +++ b/sys-apps/iproute2/iproute2-9999.ebuild
19 @@ -52,6 +52,11 @@ PATCHES=(
20 "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
21 )
22
23 +doecho() {
24 + echo "${@}"
25 + "${@}" || die
26 +}
27 +
28 src_prepare() {
29 if ! use ipv6 ; then
30 PATCHES+=(
31 @@ -102,8 +107,8 @@ src_configure() {
32 popd >/dev/null
33
34 # run "configure" script first which will create "config.mk"...
35 - LIBBPF_FORCE="$(usex bpf on off)" \
36 - econf
37 + # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
38 + doecho ./configure --libbpf_force $(usex bpf on off)
39
40 # ...now switch on/off requested features via USE flags
41 # this is only useful if the test did not set other things, per bug #643722