cross-compile fixes

3 files changed, 27 insertions, 19 deletions

diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 7bdde72452a7..dbb8de8dae5f 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,7 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 38e595116c5c8cc472efdd526104650b ChangeLog 6099
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 ce820774b9abec82a32e1ef97778e17f zlib-1.2.1-r3.ebuild 1992
-MD5 56a06576e3617c3115cfa6fd08c7e43b zlib-1.2.2.ebuild 1990
+MD5 edc51fc7a68e0c74b78a969fdd35322b zlib-1.2.1-r3.ebuild 2001
+MD5 8eb0753f37271d908fea2f539d4712d9 zlib-1.2.2.ebuild 1963
 MD5 3ccc7437df1921bba1a37d42a70e711f files/digest-zlib-1.2.2 63
 MD5 40634a4cbdcd9c795cfc34473c76038c files/zlib-1.2.2-mapfile.patch 2139
 MD5 9c2321cdb61e2d58b41a0d61a98d293b files/zlib-1.2.1-build-fPIC.patch 2252
@@ -11,3 +14,10 @@ MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r3 63
 MD5 9d3fdd73e1997aa5c823fc210f29919d files/zlib-1.2.1-configure.patch 3149
 MD5 9cdacd156a2ba9dff840c9ce7d8433db files/zlib-1.2.1-CAN-2004-0797.patch 786
 MD5 a337d1727a4f6f9ed8d29e43cde40e89 files/zlib-1.2.1-fPIC.patch 662
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBs/XtroRuSHgZdywRAtVUAJ4095e6WT/INjfBAajkHKR9L2pCewCeKcx7
+jE7zHxALG9rMC1hR8dBLJDI=
+=Nimj
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/zlib-1.2.1-r3.ebuild b/sys-libs/zlib/zlib-1.2.1-r3.ebuild
index 98df485d32de..bf9a2dd6678e 100644
--- a/sys-libs/zlib/zlib-1.2.1-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.1-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/sys-libs/zlib/zlib-1.2.1-r3.ebuild,v 1.13 2004/11/12 14:55:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.1-r3.ebuild,v 1.14 2004/12/06 06:01:55 vapier Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="http://www.gzip.org/zlib/"
@@ -14,8 +14,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="build"
 
 RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.14.90.0.6"
 
 src_unpack() {
 	unpack ${A}
@@ -36,19 +34,22 @@ src_unpack() {
 }
 
 src_compile() {
+	export CC="$(tc-getCC)" AR="$(tc-getAR) rc" RANLIB="$(tc-getRANLIB)"
+
 	./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die
 	emake || die
-	make test || die
 
 	./configure --prefix=/usr --libdir=/$(get_libdir) || die
 	emake || die
 }
 
+src_test() {
+	make test || die
+}
+
 src_install() {
 	einstall libdir=${D}/$(get_libdir) || die
-	rm ${D}/$(get_libdir)/libz.a
-	into /usr
-	dodir /usr/include
+	rm "${D}"/$(get_libdir)/libz.a
 	insinto /usr/include
 	doins zconf.h zlib.h
 
@@ -61,7 +62,6 @@ src_install() {
 
 	# we don't need the static lib in /lib
 	# as it's only for compiling against
-	into /usr
 	dolib libz.a
 
 	# all the shared libs go into /lib
diff --git a/sys-libs/zlib/zlib-1.2.2.ebuild b/sys-libs/zlib/zlib-1.2.2.ebuild
index 13a095bbf2a2..9a75ad1a486a 100644
--- a/sys-libs/zlib/zlib-1.2.2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.2.ebuild,v 1.2 2004/11/12 14:55:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.2.ebuild,v 1.3 2004/12/06 06:01:55 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -35,19 +35,18 @@ src_unpack() {
 }
 
 src_compile() {
+	export CC="$(tc-getCC)" AR="$(tc-getAR) rc" RANLIB="$(tc-getRANLIB)"
 	./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die
 	emake || die
-	make test || die
+}
 
-	./configure --prefix=/usr --libdir=/$(get_libdir) || die
-	emake || die
+src_test() {
+	make test || die
 }
 
 src_install() {
 	einstall libdir=${D}/$(get_libdir) || die
-	rm ${D}/$(get_libdir)/libz.a
-	into /usr
-	dodir /usr/include
+	rm "${D}"/$(get_libdir)/libz.a
 	insinto /usr/include
 	doins zconf.h zlib.h
 
@@ -60,7 +59,6 @@ src_install() {
 
 	# we don't need the static lib in /lib
 	# as it's only for compiling against
-	into /usr
 	dolib libz.a
 
 	# all the shared libs go into /lib