Make zlib friendly with multilib by moving some stuff from src_compile to pkg_setup.

3 files changed, 18 insertions, 15 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 7b2518ec8980..fc1428eaa7ca 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.40 2005/01/03 00:30:33 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.41 2005/01/03 07:52:34 eradicator Exp $
+
+  02 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  zlib-1.2.1-r3.ebuild, zlib-1.2.2.ebuild:
+  Make zlib friendly with multilib by moving some stuff from src_compile to
+  pkg_setup.
 
   03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/sys-libs/zlib/zlib-1.2.1-r3.ebuild b/sys-libs/zlib/zlib-1.2.1-r3.ebuild
index 0e719a36abe1..175b7f167d67 100644
--- a/sys-libs/zlib/zlib-1.2.1-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.1-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/sys-libs/zlib/zlib-1.2.1-r3.ebuild,v 1.15 2005/01/03 00:30:33 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.1-r3.ebuild,v 1.16 2005/01/03 07:52:34 eradicator Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -15,6 +15,11 @@ IUSE="build"
 
 RDEPEND="virtual/libc"
 
+pkg_setup() {
+	tc-export CC RANLIB
+	AR="$(tc-getAR) rc"
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -34,8 +39,6 @@ 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
 
@@ -43,10 +46,6 @@ src_compile() {
 	emake || die
 }
 
-src_test() {
-	make test || die
-}
-
 src_install() {
 	einstall libdir=${D}/$(get_libdir) || die
 	rm "${D}"/$(get_libdir)/libz.a
diff --git a/sys-libs/zlib/zlib-1.2.2.ebuild b/sys-libs/zlib/zlib-1.2.2.ebuild
index 938b6737e108..b89fbcd9bf71 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-2005 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.5 2005/01/03 00:30:33 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.2.ebuild,v 1.6 2005/01/03 07:52:34 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,6 +16,11 @@ IUSE="build"
 
 RDEPEND="virtual/libc"
 
+pkg_setup() {
+	tc-export CC RANLIB
+	export AR="$(tc-getAR) rc"
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -33,16 +38,10 @@ src_unpack() {
 }
 
 src_compile() {
-	tc-export CC RANLIB
-	export AR="$(tc-getAR) rc"
 	./configure --shared --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