From f27e16759ab0bfcbfdfbd4a2dc798f989971fee4 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Wed, 1 Apr 2009 07:09:45 +0000
Subject: [PATCH] =?UTF-8?q?Multiarch=5Fwrapper=20darf=20nat=C3=BCrlich=20n?=
 =?UTF-8?q?ur=20bei=2064Bit=20builds=20zum=20Einsatz=20kommen!?=
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@4588 504e572c-2e33-0410-9681-be2bf7408885
---
 BaseBuild/Basesys/gmp     |  6 ++++--
 BaseBuild/Basesys/libtool |  6 ++++--
 BaseBuild/Basesys/ncurses | 10 ++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/BaseBuild/Basesys/gmp b/BaseBuild/Basesys/gmp
index 1bfcd0e..f8bd53e 100644
--- a/BaseBuild/Basesys/gmp
+++ b/BaseBuild/Basesys/gmp
@@ -126,12 +126,13 @@ mk() {
 }
 
 postmk() {
-	mv -v $TMPROOT/usr/include/gmp{,-64}.h
 	mkdir -p $TMPROOT/usr/share
 	mv $TMPROOT/usr/info $TMPROOT/usr/share/info
 	cd ../gmp*
 	rm -r ../build-gmp
-	cat > /usr/include/gmp.h << "EOF"
+	if [ $MK64BIT == "true" ]; then
+		mv -v $TMPROOT/usr/include/gmp{,-64}.h
+		cat > /usr/include/gmp.h << "EOF"
 /* gmp.h - Stub Header */
 #ifndef __STUB__GMP_H__
 #define __STUB__GMP_H__
@@ -146,4 +147,5 @@ postmk() {
 
 #endif /* __STUB__GMP_H__ */
 EOF
+	fi
 }
diff --git a/BaseBuild/Basesys/libtool b/BaseBuild/Basesys/libtool
index c9e9aaa..3b710fa 100644
--- a/BaseBuild/Basesys/libtool
+++ b/BaseBuild/Basesys/libtool
@@ -99,8 +99,10 @@ mk() {
 		    --cache-file=config.cache
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
-	mv $TMPROOT/usr/bin/libtool{,-64}
-	ln -s multiarch_wrapper /usr/bin/libtool
+	if [ $MK64BIT == "true" ]; then
+		mv $TMPROOT/usr/bin/libtool{,-64}
+		ln -s multiarch_wrapper /usr/bin/libtool
+	fi
 }
 
 postmk() {
diff --git a/BaseBuild/Basesys/ncurses b/BaseBuild/Basesys/ncurses
index 11389b5..9701e3f 100644
--- a/BaseBuild/Basesys/ncurses
+++ b/BaseBuild/Basesys/ncurses
@@ -115,10 +115,12 @@ mk() {
 	make
 	make install
 	make DESTDIR=$TMPROOT install
-	mv -v /usr/bin/ncursesw5-config{,-64}
-	ln -svf multiarch_wrapper /usr/bin/ncursesw5-config
-	mv -v $TMPROOT/usr/bin/ncursesw5-config{,-64}
-	ln -svf multiarch_wrapper $TMPROOT/usr/bin/ncursesw5-config
+	if [ "$MK64BIT" == "true" ]; then
+		mv -v /usr/bin/ncursesw5-config{,-64}
+		ln -svf multiarch_wrapper /usr/bin/ncursesw5-config
+		mv -v $TMPROOT/usr/bin/ncursesw5-config{,-64}
+		ln -svf multiarch_wrapper $TMPROOT/usr/bin/ncursesw5-config
+	fi
 }
 
 postmk() {