From 4ab26b4dbb984beed3ce2a6e94e9baf5709e3a8e Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Wed, 7 May 2008 16:35:48 +0000
Subject: [PATCH] Dynamische Anpassung der lib Verzeichnisse. wahlweise lib
 oder lib64 je nachdem ob MK64BIT gesetzt ist oder nicht

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

diff --git a/BaseBuild/crosschain/binutils b/BaseBuild/crosschain/binutils
index 46132e0..bde6506 100644
--- a/BaseBuild/crosschain/binutils
+++ b/BaseBuild/crosschain/binutils
@@ -83,12 +83,17 @@ premk() {
 }
 
 mk() {
+	if [ ${MK64BIT} == "true" ]; then
+		LIBDIR=lib64
+	else
+		LIBDIR=lib
+	fi
 	AR=ar \
 	AS=as \
 	../binutils*/configure --host=$HOSTSYS \
 			       --target=$TARGET \
 			       --prefix=/cross-tools \
-			       --with-lib-path=/tools/lib \
+			       --with-lib-path=/tools/$LIBDIR \
 			       --disable-nls \
 			       --enable-shared \
 			       --enable-64-bit-bfd
diff --git a/BaseBuild/crosschain/gcc b/BaseBuild/crosschain/gcc
index 33b30d1..045bf31 100644
--- a/BaseBuild/crosschain/gcc
+++ b/BaseBuild/crosschain/gcc
@@ -75,6 +75,11 @@ SRCPATH=Base/Development
 (( MKPKG = $MKPKG | 128 ))
 
 premk() {
+	if [ ${MK64BIT} == "true" ]; then
+		LIBDIR=lib64
+	else
+		LIBDIR=lib
+	fi
 	ARCH=`echo $TARGET|cut -d"-" -f 1`
 	SrcPatch $MAKEDIR/gcc* $LFSSOURCE/$SRCPATH/gcc-*-branch_update-2.patch*
 	if [ -f /tmp/crossgcc_stage1 ]; then
@@ -91,14 +96,14 @@ premk() {
 	for i in $OUTFILE; do
 		echo "
 #undef STARTFILE_PREFIX_SPEC
-#define STARTFILE_PREFIX_SPEC \"/tools/lib/\"" >>$i
+#define STARTFILE_PREFIX_SPEC \"/tools/$LIBDIR/\"" >>$i
 	done
 	cp -v gcc/Makefile.in{,.orig}
 	sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \
     	gcc/Makefile.in.orig > gcc/Makefile.in
 	if [ -f /tmp/crossgcc_stage1 ]; then
 		cp -v configure{,.orig}
-		sed -e '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig >configure
+		sed -e '/FLAGS_FOR_TARGET.*\/'$LIBDIR'\//s@-B[^ ]*/'$LIBDIR'/@@g' configure.orig >configure
 	fi
 	mkdir ../build-gcc
 	cd ../build-gcc
diff --git a/BaseBuild/crosschain/glibc b/BaseBuild/crosschain/glibc
index b5b2b27..a045fc3 100644
--- a/BaseBuild/crosschain/glibc
+++ b/BaseBuild/crosschain/glibc
@@ -113,12 +113,14 @@ mk32() {
 mk() {
 	echo "libc_cv_forced_unwind=yes" > config.cache
 	echo "libc_cv_c_cleanup=yes" >> config.cache
-	if [ $MK64BIT == "true" ]; then
-		echo "slibdir=/tools/lib64" >> configparms
-		ADDCONFIGURE="--libdir=/tools/lib64"
+	if [ ${MK64BIT} == "true" ]; then
+		LIBDIR=lib64
 		if echo $ARCH|grep -q sparc; then
 			echo "libc_cv_sparc64_tls=yes" >>config.cache
 		fi
+		echo "slibdir=/tools/$LIBDIR" >> configparms
+	else
+		LIBDIR=lib
 	fi
 	BUILD_CC="gcc" \
 	CC="${TARGET}-gcc ${BUILDOPTIONS}" \
@@ -127,7 +129,7 @@ mk() {
 	../glibc*/configure --prefix=/tools \
 	                    --host=$TARGET \
 			    --build=$TARGET32 \
-			    $ADDCONFIGURE \
+			    --libdir=/tools/$LIBDIR \
 			    --disable-profile \
 			    --enable-add-ons \
 			    --with-tls \
diff --git a/BaseBuild/toolchain/binutils b/BaseBuild/toolchain/binutils
index f3a73e6..2618172 100644
--- a/BaseBuild/toolchain/binutils
+++ b/BaseBuild/toolchain/binutils
@@ -83,13 +83,14 @@
 SRCPATH=Base/Utilities
 (( MKPKG = $MKPKG | 8 ))
 (( MKPKG = $MKPKG | 16 ))
+(( MKPKG = $MKPKG | 128 ))
 
 premk() {
         SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-posix*.patch*
-        SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-genscripts*.patch*
 	SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-branch_update-3*
+        SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-genscripts*.patch*
 
-	if [ "$MK64BIT" == "true" ]; then
+	if [ ${MK64BIT} == "true" ]; then
 		BUILDOPTIONS="-m64"
 	fi
 	mkdir ../build-binutils
@@ -97,7 +98,7 @@ premk() {
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
+	if [ ${MK64BIT} == "true" ]; then
 		LIBDIR=lib64
 	else
 		LIBDIR=lib
@@ -108,7 +109,7 @@ mk() {
 		    --build=$HOSTSYS \
 		    --prefix=/tools \
 		    --libdir=/tools/$LIBDIR
-		    --with-lib-path=/tools/lib \
+		    --with-lib-path=/tools/$LIBDIR \
 		    --disable-nls \
 		    --enable-shared \
 		    --enable-64-bit-bfd