Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- iproute2-4.0.0-r1.ebuild 2015-04-20 23:51:18.000000000 +0300
- +++ iproute2-4.0.0-r1.edit.ebuild 2015-05-19 12:03:42.859907095 +0300
- @@ -1,6 +1,7 @@
- # Copyright 1999-2015 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.0.0-r1.ebuild,v 1.1 2015/04/20 20:51:18 vapier Exp $
- +# $
- +
- EAPI="5"
- @@ -65,25 +66,29 @@
- }
- src_configure() {
- - tc-export AR CC PKG_CONFIG
- -
- - # This sure is ugly. Should probably move into toolchain-funcs at some point.
- - local setns
- - pushd "${T}" >/dev/null
- - echo 'main(){return setns();};' > test.c
- - ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- - echo 'main(){};' > test.c
- - ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- - popd >/dev/null
- -
- - cat <<-EOF > Config
- - TC_CONFIG_ATM := $(usex atm y n)
- - TC_CONFIG_XT := $(usex iptables y n)
- - HAVE_SELINUX := $(usex selinux y n)
- - IP_CONFIG_SETNS := ${setns}
- - # Use correct iptables dir, #144265 #293709
- - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
- - EOF
- + if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
- + econf
- + else
- + tc-export AR CC PKG_CONFIG
- +
- + # This sure is ugly. Should probably move into toolchain-funcs at some point./
- + local setns
- + pushd "${T}" >/dev/null
- + echo 'main(){return setns();};' > test.c
- + ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- + echo 'main(){};' > test.c
- + ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- + popd >/dev/null
- +
- + cat <<-EOF > Config
- + TC_CONFIG_ATM := $(usex atm y n)
- + TC_CONFIG_XT := $(usex iptables y n)
- + HAVE_SELINUX := $(usex selinux y n)
- + IP_CONFIG_SETNS := ${setns}
- + # Use correct iptables dir, #144265 #293709
- + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
- +EOF
- + fi
- }
- src_install() {
- @@ -122,4 +127,4 @@
- dodir /usr/bin
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
- fi
- -}
- +}
- \ No newline at end of file
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement