| 1 |
commit: acabb5d1ea6ac4caba3360b00ef14a606e0d7b6a |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 2 07:29:17 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 2 07:29:17 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acabb5d1 |
| 7 |
|
| 8 |
sys-apps/iproute2: Synced live ebuild. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.23, Repoman-2.3.6 |
| 11 |
|
| 12 |
sys-apps/iproute2/iproute2-9999.ebuild | 45 ++++++++++++++++++++++++---------- |
| 13 |
1 file changed, 32 insertions(+), 13 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild |
| 16 |
index d48d995c3cf..15efa9acf6c 100644 |
| 17 |
--- a/sys-apps/iproute2/iproute2-9999.ebuild |
| 18 |
+++ b/sys-apps/iproute2/iproute2-9999.ebuild |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-# Copyright 1999-2017 Gentoo Foundation |
| 21 |
+# Copyright 1999-2018 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
EAPI=6 |
| 25 |
@@ -18,24 +18,32 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" |
| 26 |
|
| 27 |
LICENSE="GPL-2" |
| 28 |
SLOT="0" |
| 29 |
-IUSE="atm berkdb +iptables ipv6 minimal selinux" |
| 30 |
+IUSE="atm berkdb elf +iptables ipv6 minimal selinux" |
| 31 |
|
| 32 |
-RDEPEND="!net-misc/arpd |
| 33 |
+# We could make libmnl optional, but it's tiny, so eh |
| 34 |
+RDEPEND=" |
| 35 |
+ !net-misc/arpd |
| 36 |
+ !minimal? ( net-libs/libmnl ) |
| 37 |
+ elf? ( virtual/libelf ) |
| 38 |
iptables? ( >=net-firewall/iptables-1.4.20:= ) |
| 39 |
berkdb? ( sys-libs/db:= ) |
| 40 |
atm? ( net-dialup/linux-atm ) |
| 41 |
- selinux? ( sys-libs/libselinux )" |
| 42 |
-# We require newer linux-headers for ipset support #549948 |
| 43 |
-DEPEND="${RDEPEND} |
| 44 |
+ selinux? ( sys-libs/libselinux ) |
| 45 |
+" |
| 46 |
+# We require newer linux-headers for ipset support #549948 and some defines #553876 |
| 47 |
+DEPEND=" |
| 48 |
+ ${RDEPEND} |
| 49 |
app-arch/xz-utils |
| 50 |
iptables? ( virtual/pkgconfig ) |
| 51 |
>=sys-devel/bison-2.4 |
| 52 |
sys-devel/flex |
| 53 |
- >=sys-kernel/linux-headers-3.7 |
| 54 |
- elibc_glibc? ( >=sys-libs/glibc-2.7 )" |
| 55 |
+ >=sys-kernel/linux-headers-3.16 |
| 56 |
+ elibc_glibc? ( >=sys-libs/glibc-2.7 ) |
| 57 |
+" |
| 58 |
|
| 59 |
PATCHES=( |
| 60 |
"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 |
| 61 |
+ "${FILESDIR}"/${PN}-4.14.1-configure-nomagic.patch # bug 643722 |
| 62 |
) |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
@@ -66,9 +74,6 @@ src_prepare() { |
| 66 |
rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc |
| 67 |
sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die |
| 68 |
|
| 69 |
- # don't build arpd if USE=-berkdb #81660 |
| 70 |
- use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile |
| 71 |
- |
| 72 |
use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile |
| 73 |
} |
| 74 |
|
| 75 |
@@ -84,11 +89,20 @@ src_configure() { |
| 76 |
${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile |
| 77 |
popd >/dev/null |
| 78 |
|
| 79 |
- cat <<-EOF > Config |
| 80 |
+ # run "configure" script first which will create "config.mk"... |
| 81 |
+ econf |
| 82 |
+ |
| 83 |
+ # ...now switch on/off requested features via USE flags |
| 84 |
+ # this is only useful if the test did not set other things, per bug #643722 |
| 85 |
+ cat <<-EOF >> config.mk |
| 86 |
TC_CONFIG_ATM := $(usex atm y n) |
| 87 |
TC_CONFIG_XT := $(usex iptables y n) |
| 88 |
+ TC_CONFIG_NO_XT := $(usex iptables n y) |
| 89 |
# We've locked in recent enough kernel headers #549948 |
| 90 |
TC_CONFIG_IPSET := y |
| 91 |
+ HAVE_BERKELEY_DB := $(usex berkdb y n) |
| 92 |
+ HAVE_MNL := $(usex minimal n y) |
| 93 |
+ HAVE_ELF := $(usex elf y n) |
| 94 |
HAVE_SELINUX := $(usex selinux y n) |
| 95 |
IP_CONFIG_SETNS := ${setns} |
| 96 |
# Use correct iptables dir, #144265 #293709 |
| 97 |
@@ -96,10 +110,15 @@ src_configure() { |
| 98 |
EOF |
| 99 |
} |
| 100 |
|
| 101 |
+src_compile() { |
| 102 |
+ emake V=1 |
| 103 |
+} |
| 104 |
+ |
| 105 |
src_install() { |
| 106 |
if use minimal ; then |
| 107 |
into / |
| 108 |
- dosbin tc/tc ip/ip |
| 109 |
+ dosbin tc/tc |
| 110 |
+ dobin ip/ip |
| 111 |
return 0 |
| 112 |
fi |
Archives