| 1 |
commit: b9f7156c27af59f3871f3f5c7c1b5440782893e2 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Nov 29 19:00:49 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Nov 29 19:00:49 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b9f7156c |
| 7 |
|
| 8 |
sys-apps/iproute2: version bump to 4.14.1-r1 |
| 9 |
|
| 10 |
.../{iproute2-4.14.1.ebuild => iproute2-4.14.1-r1.ebuild} | 7 ++++--- |
| 11 |
sys-apps/iproute2/iproute2-4.4.0.ebuild | 9 +++++---- |
| 12 |
sys-apps/iproute2/metadata.xml | 2 +- |
| 13 |
3 files changed, 10 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/iproute2/iproute2-4.14.1.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild |
| 16 |
similarity index 96% |
| 17 |
rename from sys-apps/iproute2/iproute2-4.14.1.ebuild |
| 18 |
rename to sys-apps/iproute2/iproute2-4.14.1-r1.ebuild |
| 19 |
index 48f244b..b8a34e6 100644 |
| 20 |
--- a/sys-apps/iproute2/iproute2-4.14.1.ebuild |
| 21 |
+++ b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild |
| 22 |
@@ -23,7 +23,7 @@ IUSE="atm berkdb +iptables ipv6 minimal selinux" |
| 23 |
# We could make libmnl optional, but it's tiny, so eh |
| 24 |
RDEPEND=" |
| 25 |
!net-misc/arpd |
| 26 |
- !minimal? ( net-libs/libmnl ) |
| 27 |
+ !minimal? ( net-libs/libmnl virtual/libelf ) |
| 28 |
iptables? ( >=net-firewall/iptables-1.4.20:= ) |
| 29 |
berkdb? ( sys-libs/db:= ) |
| 30 |
atm? ( net-dialup/linux-atm ) |
| 31 |
@@ -34,7 +34,7 @@ DEPEND=" |
| 32 |
${RDEPEND} |
| 33 |
app-arch/xz-utils |
| 34 |
iptables? ( virtual/pkgconfig ) |
| 35 |
- sys-devel/bison |
| 36 |
+ >=sys-devel/bison-2.4 |
| 37 |
sys-devel/flex |
| 38 |
>=sys-kernel/linux-headers-3.16 |
| 39 |
elibc_glibc? ( >=sys-libs/glibc-2.7 ) |
| 40 |
@@ -63,7 +63,7 @@ src_prepare() { |
| 41 |
default |
| 42 |
|
| 43 |
sed -i \ |
| 44 |
- -e '/^CC :=/d' \ |
| 45 |
+ -e '/^CC :\?=/d' \ |
| 46 |
-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
| 47 |
-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ |
| 48 |
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
| 49 |
@@ -104,6 +104,7 @@ src_configure() { |
| 50 |
TC_CONFIG_IPSET := y |
| 51 |
HAVE_BERKELEY_DB := $(usex berkdb y n) |
| 52 |
HAVE_MNL := $(usex minimal n y) |
| 53 |
+ HAVE_ELF := $(usex minimal n y) |
| 54 |
HAVE_SELINUX := $(usex selinux y n) |
| 55 |
IP_CONFIG_SETNS := ${setns} |
| 56 |
# Use correct iptables dir, #144265 #293709 |
| 57 |
|
| 58 |
diff --git a/sys-apps/iproute2/iproute2-4.4.0.ebuild b/sys-apps/iproute2/iproute2-4.4.0.ebuild |
| 59 |
index 3741d1f..4e5b37c 100644 |
| 60 |
--- a/sys-apps/iproute2/iproute2-4.4.0.ebuild |
| 61 |
+++ b/sys-apps/iproute2/iproute2-4.4.0.ebuild |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-# Copyright 1999-2016 Gentoo Foundation |
| 64 |
+# Copyright 1999-2017 Gentoo Foundation |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
|
| 67 |
EAPI="5" |
| 68 |
@@ -22,7 +22,7 @@ IUSE="atm berkdb +iptables ipv6 minimal selinux" |
| 69 |
|
| 70 |
# We could make libmnl optional, but it's tiny, so eh |
| 71 |
RDEPEND="!net-misc/arpd |
| 72 |
- !minimal? ( net-libs/libmnl ) |
| 73 |
+ !minimal? ( net-libs/libmnl virtual/libelf ) |
| 74 |
iptables? ( >=net-firewall/iptables-1.4.20:= ) |
| 75 |
berkdb? ( sys-libs/db:= ) |
| 76 |
atm? ( net-dialup/linux-atm ) |
| 77 |
@@ -31,7 +31,7 @@ RDEPEND="!net-misc/arpd |
| 78 |
DEPEND="${RDEPEND} |
| 79 |
app-arch/xz-utils |
| 80 |
iptables? ( virtual/pkgconfig ) |
| 81 |
- sys-devel/bison |
| 82 |
+ >=sys-devel/bison-2.4 |
| 83 |
sys-devel/flex |
| 84 |
>=sys-kernel/linux-headers-3.16 |
| 85 |
elibc_glibc? ( >=sys-libs/glibc-2.7 )" |
| 86 |
@@ -44,7 +44,7 @@ src_prepare() { |
| 87 |
epatch "${FILESDIR}"/${PN}-4.4.0-missing-limits_h.patch |
| 88 |
|
| 89 |
sed -i \ |
| 90 |
- -e '/^CC =/d' \ |
| 91 |
+ -e '/^CC :\?=/d' \ |
| 92 |
-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ |
| 93 |
-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ |
| 94 |
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ |
| 95 |
@@ -84,6 +84,7 @@ src_configure() { |
| 96 |
TC_CONFIG_IPSET := y |
| 97 |
HAVE_BERKELEY_DB := $(usex berkdb y n) |
| 98 |
HAVE_MNL := $(usex minimal n y) |
| 99 |
+ HAVE_ELF := $(usex minimal n y) |
| 100 |
HAVE_SELINUX := $(usex selinux y n) |
| 101 |
IP_CONFIG_SETNS := ${setns} |
| 102 |
# Use correct iptables dir, #144265 #293709 |
| 103 |
|
| 104 |
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml |
| 105 |
index 0fa0b4c..2605d5f 100644 |
| 106 |
--- a/sys-apps/iproute2/metadata.xml |
| 107 |
+++ b/sys-apps/iproute2/metadata.xml |
| 108 |
@@ -8,6 +8,6 @@ |
| 109 |
<use> |
| 110 |
<flag name="berkdb">build programs that use berkdb (just arpd)</flag> |
| 111 |
<flag name="iptables">include support for iptables filtering</flag> |
| 112 |
- <flag name="minimal">only install ip and tc programs</flag> |
| 113 |
+ <flag name="minimal">only install ip and tc programs, without eBPF support</flag> |
| 114 |
</use> |
| 115 |
</pkgmetadata> |
Archives