From 8ff051b453e3cf8598e4f5bdf96b2f2b8eda55f4 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Sat, 22 May 2004 17:00:24 +0000
Subject: [PATCH] Rene Rebe: 	* mergef r3059 from 2.0-stable           *
 fixed sparc/gcc-options (typo)           * fixed dietlibc for native 32bit
 builds on 64bit systems (x86-64,             sparc64, powerpc64, ...) +
 cleanups along the lines

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3060 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 architecture/sparc/gcc-options      |  2 +-
 package/base/dietlibc/dietlibc.conf | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/architecture/sparc/gcc-options b/architecture/sparc/gcc-options
index 0e00394dd..a24907e60 100644
--- a/architecture/sparc/gcc-options
+++ b/architecture/sparc/gcc-options
@@ -4,7 +4,7 @@ if [ "$ROCKCFG_SPARC_OPT" != "generic" ] ; then
 
 	case "$ROCKCFG_SPARC_OPT" in
 		v7) tune=cypress ;;
-		v8) tune=superspace ;;
+		v8) tune=supersparc ;;
 		v9) tune=ultrasparc ;;
 	esac
 	[ "$tune" ] && var_append GCC_WRAPPER_INSERT " " "-mtune=$tune" 
diff --git a/package/base/dietlibc/dietlibc.conf b/package/base/dietlibc/dietlibc.conf
index eaa3d451a..8c2bc0655 100644
--- a/package/base/dietlibc/dietlibc.conf
+++ b/package/base/dietlibc/dietlibc.conf
@@ -39,13 +39,14 @@ EOT
 	fi
 
 	if [ "$crossnative" = native ] ; then
-		eval "$MAKE $makeopt"
+		# dietlibc uses uname - so we always need to set ARCH
+		eval "$MAKE MYARCH=$cpu $makeopt"
 		if [ $toolsdir = tools.cross ] ; then
 			cp -v bin-*/diet-i     $toolsbin/diet     || true
 			cp -v bin-*/diet-dyn-i $toolsbin/diet-dyn || true
 		fi
 
-		eval "$MAKE $makeinstopt"
+		eval "$MAKE MYARCH=$cpu $makeinstopt"
 	else
 		mkdir bin-$cpu ; ln -s bin-$cpu "bin-${CC%%-*}"
 
@@ -55,8 +56,8 @@ EOT
 			cp -v bin-*/diet-dyn-i $toolsbin/diet-dyn || true
 		fi
 
-		eval "$MAKE $makeopt ARCH=$cpu CROSS=$archprefix"
-		eval "$MAKE $makeinstopt ARCH=$cpu MYARCH=$cpu"
+		eval "$MAKE MYARCH=$cpu $makeopt CROSS=$archprefix"
+		eval "$MAKE MYARCH=$cpu $makeinstopt"
 	fi
 
 	if [ -d $root/$prefix/dietlibc/lib-ppc ] ; then
@@ -75,14 +76,14 @@ else
 	makeopt="$makeopt prefix=/$prefix CC=gcc all"
 fi
 
-makeinstopt="$makeinstopt DESTDIR=$root"
+cpu="`echo "$arch_machine" | sed -e s/i.86/i386/ -e s/powerpc/ppc/`"
+
+var_append makeinstopt " " "DESTDIR=$root"
 toolsbin=$base/build/$ROCKCFG_ID/ROCK/$toolsdir/diet-bin
 toolsinc=$base/build/$ROCKCFG_ID/ROCK/$toolsdir/diet-include
 
-cpu="`echo "$arch_machine" | sed -e s/i.86/i386/ -e s/powerpc/ppc/`"
-
 if [ "$cpu" = arm -o "$cpu" = i386 ] ; then
-	makeopt="$makeopt dyn"
+	var_append makeopt " " "dyn"
 fi
 
 if [ "$stagelevel" -eq 0 ]; then