cross-compile fixes

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index b9636aaef83764ce5b68c6254853af76ed521dc5..505b678c9f50143a5b7cf1bebdaaad633194b4b0 100644 (file)
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,6 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 a8cf19231cceaf80487680b01b7ad304 ChangeLog 4882
 MD5 c6c85d3ec6fc1a2446f71745893dd476 iputils-020927.ebuild 1387
-MD5 04c2b11f4b826c52cd4dec34b50b7823 iputils-021109-r3.ebuild 2657
+MD5 bad79d640b481817ce5ca72801e18078 iputils-021109-r3.ebuild 2692
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 d6d6f3cb8ff77c826d432ed7eb394c43 files/digest-iputils-020927 68
 MD5 0a62fdeb93c761e5407fd3e185308a99 files/iputils-021109-pfkey.patch 3477
@@ -9,3 +12,10 @@ MD5 2baac2d4f1c8f01957aaaf6b6349c203 files/021109-gcc34.patch 347
 MD5 66a524e27160410a2dbaef8d2eed5365 files/digest-iputils-021109-r3 73
 MD5 b4615612d4514f12b35fbaf27d3e04fe files/iputils-20020927-no-ether_ntohost.patch 635
 MD5 79de65b9da536090d0560ba51520fd9d files/iputils-021109-linux-udp-header.patch 418
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBtlJUroRuSHgZdywRAumFAJoCjqPZMKSEb4IPm3vENHiw06cF4wCdHW9+
+xlfd+s2X6lYFDyQXvzFTPUw=
+=mcf4
+-----END PGP SIGNATURE-----

diff --git a/net-misc/iputils/iputils-021109-r3.ebuild b/net-misc/iputils/iputils-021109-r3.ebuild
index cf91d8a5bfc37088b747cb1eb540124a3cf8e9b0..dc233582596aa3c86ebfc3f9bbb11850c01119d8 100644 (file)
--- a/net-misc/iputils/iputils-021109-r3.ebuild
+++ b/net-misc/iputils/iputils-021109-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.12 2004/11/12 15:49:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.13 2004/12/08 01:00:59 vapier Exp $
 
-inherit flag-o-matic gcc gnuconfig eutils
+inherit flag-o-matic gnuconfig eutils toolchain-funcs
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
 HOMEPAGE="ftp://ftp.inr.ac.ru/ip-routing"
@@ -44,7 +44,7 @@ src_unpack() {
 
        sed -i \
                -e "/^CCOPT=/s:-O2:${CFLAGS}:" \
-               -e "/^CC=/s:gcc:$(gcc-getCC):" \
+               -e "/^CC=/s:.*::" \
                Makefile \
                || die "sed Makefile opts failed"
        sed -i \
@@ -53,7 +53,7 @@ src_unpack() {
                || die "sed /usr/include failed"
        use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile
 
-       sed -i "s:-ll:-lfl ${LDFLAGS}:" setkey/Makefile || die "sed setkey failed"
+       sed -i "s:-ll:-lfl -L${ROOT}/usr/lib ${LDFLAGS}:" setkey/Makefile || die "sed setkey failed"
 
        sed -i 's:yacc:bison -y:' libipsec/Makefile #59191
 
@@ -62,6 +62,8 @@ src_unpack() {
 }
 
 src_compile() {
+       tc-export CC AR
+
        if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ] ; then
                cd ${S}/libipsec
                emake || die "libipsec failed"