From fe2f4e91be334d5c6157176aad4b453938a3eb0b Mon Sep 17 00:00:00 2001
From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Wed, 25 Jan 2006 21:06:50 +0000
Subject: [PATCH] Added sparc patches for udev/klibc.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@359 67a159dc-881f-0410-a524-ba9dfbe2cb84
---
 gen_arch.sh    |  6 ++++++
 gen_compile.sh | 17 +++++++++++------
 genkernel      |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/gen_arch.sh b/gen_arch.sh
index 44de875..fcb45fe 100755
--- a/gen_arch.sh
+++ b/gen_arch.sh
@@ -32,6 +32,12 @@ get_official_arch() {
 			UTILS_ARCH=${UTILS_ARCH}
 		fi
 	fi
+
+	# sparc64 klibc is b0rked, so we force to 32
+	if [ "${ARCH}" = 'sparc64' ]
+	then
+		UTILS_ARCH='sparc'
+	fi
 	
 	ARCH_CONFIG="${GK_SHARE}/${ARCH}/config.sh"
 	[ -f "${ARCH_CONFIG}" ] || gen_die "${ARCH} not yet supported by genkernel. Please add the arch-specific config file, ${ARCH_CONFIG}"
diff --git a/gen_compile.sh b/gen_compile.sh
index bbce545..ddb7134 100644
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -726,6 +726,12 @@ compile_klibc() {
 	[ ! -d "${KLIBC_DIR}" ] &&
 		gen_die "klibc tarball ${KLIBC_SRCTAR} is invalid"
 	cd "${KLIBC_DIR}"
+	if [ -f ${GK_SHARE}/pkg/klibc-1.1.16-sparc2.patch ]
+	then
+		patch -p1 -i \
+			${GK_SHARE}/pkg/klibc-1.1.16-sparc2.patch \
+			|| gen_die "Failed patching klibc"
+	fi
 
 	# Don't install to "//lib" fix
 	sed -e 's:SHLIBDIR = /lib:SHLIBDIR = $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib:' -i scripts/Kbuild.install
@@ -739,9 +745,6 @@ compile_klibc() {
 	if [ "${ARCH}" = 'um' ]
 	then
 		compile_generic "ARCH=um" utils
-	elif [ "${ARCH}" = 'sparc64' ]
-	then
-		compile_generic "ARCH=sparc64 CROSS=sparc64-unknown-linux-gnu-" utils
 	elif [ "${ARCH}" = 'x86' ]
 	then
 		compile_generic "ARCH=i386" utils
@@ -784,6 +787,11 @@ compile_udev() {
     		# No selinux support yet .. someday maybe
 		#use selinux && myconf="${myconf} USE_SELINUX=true"
 		print_info 1 'udev: >> Compiling...'
+		# SPARC fixup
+		if [ "${UTILS_ARCH}" = 'sparc' ]
+		then
+			echo "CFLAGS += -mcpu=v8 -mtune=v8" >> Makefile
+		fi
 		# PPC fixup for 2.6.14
 		if [ "${VER}" -eq '2' -a "${PAT}" -eq '6' -a "${SUB}" -ge '14' ]
         	then
@@ -797,9 +805,6 @@ compile_udev() {
 		if [ "${ARCH}" = 'um' ]
 		then
 			compile_generic "EXTRAS=\"${extras}\" ARCH=um USE_KLIBC=true KLCC=${TEMP}/klibc-build/bin/klcc USE_LOG=false DEBUG=false udevdir=/dev all" utils
-		elif [ "${ARCH}" = 'sparc64' ]
-		then
-			compile_generic "EXTRAS=\"${extras}\" ARCH=sparc64 CROSS=sparc64-unknown-linux-gnu- USE_KLIBC=true KLCC=${TEMP}/klibc-build/bin/klcc USE_LOG=false DEBUG=false udevdir=/dev all" utils
 		else
 			# This *needs* to be runtask, or else it breakson most
 			# architectures.  -- wolf31o2
diff --git a/genkernel b/genkernel
index 00f201f..c480a01 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.3.11_pre4'
+GK_V='3.3.11_pre5'
 
 TMPDIR='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.
-- 
2.26.2