diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-01-04 04:28:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-01-04 04:28:15 +0000 |
| commit | e7ac6ddee7a147ec383d515d6579473d0a27b738 (patch) | |
| tree | f04f00f8d92509be2d69feca26c7261556feecd5 /net-misc/iputils | |
| parent | update HOMEPAGE #24087 (Manifest recommit) (diff) | |
| download | gentoo-2-e7ac6ddee7a147ec383d515d6579473d0a27b738.tar.gz gentoo-2-e7ac6ddee7a147ec383d515d6579473d0a27b738.tar.bz2 gentoo-2-e7ac6ddee7a147ec383d515d6579473d0a27b738.zip | |
Make sure linux/ipsec.h is usuable before building ipsec stuff #67569.
Diffstat (limited to 'net-misc/iputils')
| -rw-r--r-- | net-misc/iputils/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/iputils/iputils-021109-r3.ebuild | 18 |
2 files changed, 12 insertions, 11 deletions
diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog index 431cf3e544ea..da741c09d7a2 100644 --- a/net-misc/iputils/ChangeLog +++ b/net-misc/iputils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/iputils # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.34 2005/01/04 03:52:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.35 2005/01/04 04:28:15 vapier Exp $ + + 03 Jan 2005; Mike Frysinger <vapier@gentoo.org> iputils-021109-r3.ebuild: + Make sure linux/ipsec.h is usuable before building ipsec stuff #67569. 03 Jan 2005; Mike Frysinger <vapier@gentoo.org> +files/021109-ipg-linux-2.6.patch, iputils-021109-r3.ebuild: diff --git a/net-misc/iputils/iputils-021109-r3.ebuild b/net-misc/iputils/iputils-021109-r3.ebuild index 9142a744f783..20a21c23ce69 100644 --- a/net-misc/iputils/iputils-021109-r3.ebuild +++ b/net-misc/iputils/iputils-021109-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.15 2005/01/04 04:02:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.16 2005/01/04 04:28:15 vapier Exp $ inherit flag-o-matic gnuconfig eutils toolchain-funcs @@ -51,12 +51,13 @@ src_unpack() { Makefile \ || die "sed Makefile opts failed" sed -i \ - -e "s:/usr/src/linux/include:${ROOT}/usr/include:" \ + -e 's:-I$(KERNEL_INCLUDE)::' \ + -e 's:-I/usr/src/linux/include::' \ Makefile libipsec/Makefile setkey/Makefile \ || die "sed /usr/include failed" use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile - sed -i "s:-ll:-lfl -L${ROOT}/usr/lib ${LDFLAGS}:" setkey/Makefile || die "sed setkey failed" + sed -i "s:-ll:-lfl ${LDFLAGS}:" setkey/Makefile || die "sed setkey failed" sed -i 's:yacc:bison -y:' libipsec/Makefile #59191 } @@ -64,7 +65,9 @@ src_unpack() { src_compile() { tc-export CC AR - if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ] ; then + # We have to make sure ipsec.h is usuable #67569 + echo '#include <linux/ipsec.h>' > "${T}"/test.c + if ${CC} -c "${T}"/test.c >&/dev/null ; then cd ${S}/libipsec emake || die "libipsec failed" @@ -82,17 +85,12 @@ src_compile() { } src_install() { - if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ] ; then - into /usr - dobin ${S}/setkey/setkey - fi - - cd ${S} into / dobin ping use ipv6 && dobin ping6 dosbin arping into /usr + [[ -x setkey/setkey ]] && dobin setkey/setkey dosbin tracepath use ipv6 && dosbin trace{path,route}6 dosbin clockdiff rarpd rdisc ipg tftpd |