From fe08ce6c36b2ce24fc01f93fc7b4822dca5e3434 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Tue, 23 Mar 2010 11:06:55 +0000
Subject: [PATCH] =?UTF-8?q?Kleine=20Anpassungen=20in=20den=20Modulen=20sor?=
 =?UTF-8?q?gen=20nun=20dafuer,=20das=20Viitor=20V962=20auch=20sich=20selbe?=
 =?UTF-8?q?r=20=C3=BCbersetzen=20kann?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5481 504e572c-2e33-0410-9681-be2bf7408885
---
 BaseBuild/crosschain/binutils | 5 +----
 BaseBuild/crosschain/gcc      | 3 +++
 BaseBuild/crosschain/glibc    | 4 ++++
 BaseBuild/toolchain/binutils  | 5 +----
 BaseBuild/toolchain/zlib      | 4 +---
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/BaseBuild/crosschain/binutils b/BaseBuild/crosschain/binutils
index b6dbf77..891dcbe 100644
--- a/BaseBuild/crosschain/binutils
+++ b/BaseBuild/crosschain/binutils
@@ -78,8 +78,6 @@ premk() {
 	SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-posix*.patch*
 	SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-branch_update-*.patch*
 	SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-genscripts_multilib-*.patch*
-	mkdir ../build-binutils
-	cd ../build-binutils
 }
 
 mk() {
@@ -100,6 +98,5 @@ mk() {
 }
 
 postmk() {
-	cd ../binutils*
-	rm -r ../build-binutils
+	echo "Nothing to do for postmk()"
 }
diff --git a/BaseBuild/crosschain/gcc b/BaseBuild/crosschain/gcc
index a01f72d..48972d4 100644
--- a/BaseBuild/crosschain/gcc
+++ b/BaseBuild/crosschain/gcc
@@ -101,6 +101,9 @@ premk() {
 	if [ ! -f /tmp/crossgcc_stage1 ]; then
 		touch /tools/include/limits.h
 	fi
+	if [ ! -f /lib/cpp ]; then
+		ln -sf ../usr/bin/cpp /lib/cpp
+	fi
 	mkdir ../build-gcc
 	cd ../build-gcc
 }
diff --git a/BaseBuild/crosschain/glibc b/BaseBuild/crosschain/glibc
index 1ba26d3..aeed069 100644
--- a/BaseBuild/crosschain/glibc
+++ b/BaseBuild/crosschain/glibc
@@ -100,8 +100,10 @@ mk32() {
 			    --with-binutils=/cross-tools/bin \
 			    --with-headers=/tools/include \
 			    --cache-file=config.cache
+	sed -i "s/\(^MAKEINFO = makeinfo\)/\1 --force/" config.make
 	make -j $NUMCPU
 	make -j $NUMCPU install
+	make install
 	cd ../glibc*
 	rm -r ../build-glibc/
 	mkdir ../build-glibc
@@ -136,8 +138,10 @@ mk() {
 			    --with-binutils=/cross-tools/bin \
 			    --with-headers=/tools/include \
 			    --cache-file=config.cache
+	sed -i "s/\(^MAKEINFO = makeinfo\)/\1 --force/" config.make
 	make -j $NUMCPU
 	make -j $NUMCPU install
+	make install
 }
 
 postmk() {
diff --git a/BaseBuild/toolchain/binutils b/BaseBuild/toolchain/binutils
index 0b1f3ab..85ab73a 100644
--- a/BaseBuild/toolchain/binutils
+++ b/BaseBuild/toolchain/binutils
@@ -90,8 +90,6 @@ premk() {
 	SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-branch_update-*.patch*
         SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-genscripts_multilib-*.patch*
 
-	mkdir ../build-binutils
-	cd ../build-binutils
 }
 
 mk() {
@@ -116,6 +114,5 @@ mk() {
 }
 
 postmk() {
-	cd ../binutils*
-	rm -r ../build-binutils
+	echo "Nothing to do for premk()"
 }
diff --git a/BaseBuild/toolchain/zlib b/BaseBuild/toolchain/zlib
index 893e37e..d8aebff 100644
--- a/BaseBuild/toolchain/zlib
+++ b/BaseBuild/toolchain/zlib
@@ -85,9 +85,7 @@ SRCPATH=Base/Lib
 (( MKPKG = $MKPKG | 8 ))
 (( MKPKG = $MKPKG | 16 ))
 
-if [ "$MK64BIT" == "true" ]; then
-	(( MKPKG = $MKPKG | 128 ))
-fi
+(( MKPKG = $MKPKG | 128 ))
 
 premk() {
 	echo "nothing to do for premk()"