commit: acabb5d1ea6ac4caba3360b00ef14a606e0d7b6a Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri Feb 2 07:29:17 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Feb 2 07:29:17 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acabb5d1
sys-apps/iproute2: Synced live ebuild. Package-Manager: Portage-2.3.23, Repoman-2.3.6 sys-apps/iproute2/iproute2-9999.ebuild | 45 ++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index d48d995c3cf..15efa9acf6c 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,24 +18,32 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"; LICENSE="GPL-2" SLOT="0" -IUSE="atm berkdb +iptables ipv6 minimal selinux" +IUSE="atm berkdb elf +iptables ipv6 minimal selinux" -RDEPEND="!net-misc/arpd +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl ) + elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) atm? ( net-dialup/linux-atm ) - selinux? ( sys-libs/libselinux )" -# We require newer linux-headers for ipset support #549948 -DEPEND="${RDEPEND} + selinux? ( sys-libs/libselinux ) +" +# We require newer linux-headers for ipset support #549948 and some defines #553876 +DEPEND=" + ${RDEPEND} app-arch/xz-utils iptables? ( virtual/pkgconfig ) >=sys-devel/bison-2.4 sys-devel/flex - >=sys-kernel/linux-headers-3.7 - elibc_glibc? ( >=sys-libs/glibc-2.7 )" + >=sys-kernel/linux-headers-3.16 + elibc_glibc? ( >=sys-libs/glibc-2.7 ) +" PATCHES=( "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 + "${FILESDIR}"/${PN}-4.14.1-configure-nomagic.patch # bug 643722 ) src_prepare() { @@ -66,9 +74,6 @@ src_prepare() { rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - # don't build arpd if USE=-berkdb #81660 - use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile - use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile } @@ -84,11 +89,20 @@ src_configure() { ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile popd >/dev/null - cat <<-EOF > Config + # run "configure" script first which will create "config.mk"... + econf + + # ...now switch on/off requested features via USE flags + # this is only useful if the test did not set other things, per bug #643722 + cat <<-EOF >> config.mk TC_CONFIG_ATM := $(usex atm y n) TC_CONFIG_XT := $(usex iptables y n) + TC_CONFIG_NO_XT := $(usex iptables n y) # We've locked in recent enough kernel headers #549948 TC_CONFIG_IPSET := y + HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_MNL := $(usex minimal n y) + HAVE_ELF := $(usex elf y n) HAVE_SELINUX := $(usex selinux y n) IP_CONFIG_SETNS := ${setns} # Use correct iptables dir, #144265 #293709 @@ -96,10 +110,15 @@ src_configure() { EOF } +src_compile() { + emake V=1 +} + src_install() { if use minimal ; then into / - dosbin tc/tc ip/ip + dosbin tc/tc + dobin ip/ip return 0 fi
