Added sparc64 fix for bug #27171.

4 files changed, 45 insertions, 11 deletions

diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog
index cca3880d6b90..8384bc60b7ee 100644
--- a/dev-libs/dietlibc/ChangeLog
+++ b/dev-libs/dietlibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/dietlibc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.16 2003/09/13 01:07:13 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.17 2003/09/30 00:01:18 weeve Exp $
+
+  29 Sep 2003; Jason Wever <weeve@gentoo.org> dietlibc-0.22-r2.ebuild,
+  dietlibc-0.23.ebuild:
+  Added sparc64 fix for bug #27171.
 
 *dietlibc-0.23 (12 Sep 2003)
 
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 3ba7da7a48cf..f7c565b00164 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,8 +1,8 @@
-MD5 89dc405d36d3039371c6573b48000f00 ChangeLog 2251
-MD5 d72aa4b738941cbfa5502aa76ad98f5c dietlibc-0.22-r2.ebuild 1252
-MD5 3ffb079e5404553914af7618eccce9f6 dietlibc-0.23.ebuild 1205
+MD5 f6f7c97eba5314bd81c7213da01cd70d ChangeLog 2383
+MD5 7d4445f599d076ff858deb07de2a1dfc dietlibc-0.22-r2.ebuild 1655
+MD5 d40a4edcc462698330cd79835a7084a1 dietlibc-0.23.ebuild 1609
 MD5 e33c0d8f3c56f85d1caa98118824fceb files/0.22-dirent-prototype.patch 563
+MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.23-dirent-prototype.patch 668
 MD5 67b93dd4033c0e66d42b6bade33c73fc files/dietlibc-0.22_xdr_security_fix.patch 5566
 MD5 2644f8611fcb7a147ec9ef76eaf5992a files/digest-dietlibc-0.22-r2 66
 MD5 b06d21ffc62c7a660a29351e55213a0b files/digest-dietlibc-0.23 66
-MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.23-dirent-prototype.patch 668
diff --git a/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild b/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild
index 2bbb28001503..9576cc5d0d2f 100644
--- a/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild,v 1.5 2003/08/11 19:50:49 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild,v 1.6 2003/09/30 00:01:18 weeve Exp $
 
 inherit eutils flag-o-matic
 filter-flags "-fstack-protector"
@@ -30,11 +30,26 @@ src_unpack() {
 }
 
 src_compile() {
-	emake || die
+# Added by Jason Wever <weeve@gentoo.org>
+# Fix for bug #27171.
+# dietlibc assumes that if uname -m is sparc64, then gcc is 64 bit
+# but this is not the case on Gentoo currently.
+
+	if [ "${ARCH}" = "sparc" -a "${PROFILE_ARCH}" = "sparc64" ]; then
+		cd ${S}
+		/bin/sparc32 make
+	else
+		emake || die
+	fi
 }
 
 src_install() {
-	make install || die
+	if [ "${ARCH}" = "sparc" -a "${PROFILE_ARCH}" = "sparc64" ]; then
+		cd ${S}
+		/bin/sparc32 make install
+	else
+		make install || die
+	fi
 
 	exeinto /usr/bin
 #	newexe bin-i386/diet-i diet
diff --git a/dev-libs/dietlibc/dietlibc-0.23.ebuild b/dev-libs/dietlibc/dietlibc-0.23.ebuild
index 30dc3a57f807..736cab171502 100644
--- a/dev-libs/dietlibc/dietlibc-0.23.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.23.ebuild,v 1.1 2003/09/13 01:07:13 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.23.ebuild,v 1.2 2003/09/30 00:01:18 weeve Exp $
 
 inherit eutils flag-o-matic
 filter-flags "-fstack-protector"
@@ -29,11 +29,26 @@ src_unpack() {
 }
 
 src_compile() {
-	emake || die
+# Added by Jason Wever <weeve@gentoo.org>
+# Fix for bug #27171.
+# dietlibc assumes that if uname -m is sparc64, then gcc is 64 bit
+# but this is not the case on Gentoo currently.
+
+	if [ "${ARCH}" = "sparc" -a "${PROFILE_ARCH}" = "sparc64" ]; then
+		cd ${S}
+		/bin/sparc32 make
+	else
+		emake || die
+	fi
 }
 
 src_install() {
-	make install || die
+	if [ "${ARCH}" = "sparc" -a "${PROFILE_ARCH}" = "sparc64" ]; then
+		cd ${S}
+		/bin/sparc32 make install
+	else
+		make install || die
+	fi
 
 	exeinto /usr/bin
 #	newexe bin-i386/diet-i diet