From 99023a484aac02a803cfd8c08112834d68cb8736 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Tue, 13 May 2008 08:50:20 +0000
Subject: [PATCH] Anpassung an V962. Uebernahme der Compile Optionen aus
 Linuxfromscratch

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4486 504e572c-2e33-0410-9681-be2bf7408885
---
 BaseBuild/Basesys/glibc | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/BaseBuild/Basesys/glibc b/BaseBuild/Basesys/glibc
index 9fc1a52..2355ef0 100644
--- a/BaseBuild/Basesys/glibc
+++ b/BaseBuild/Basesys/glibc
@@ -74,21 +74,17 @@ SRCPATH=Base/lib
 (( MKPKG = $MKPKG | 128 ))
 
 premk() {
-	ARCH=`echo $TARGET|cut -d"-" -f 1`
+	SrcPatch $MAKEDIR/glibc* $LFSSOURCE/$SRCPATH/glibc-*-branch_update-1A*
 	SrcPatch $MAKEDIR/glibc* $LFSSOURCE/$SRCPATH/glibc-*-localedef_segfault*
-	SrcPatch $MAKEDIR/glibc* $LFSSOURCE/$SRCPATH/glibc-*-branch_update-2*
-	SrcPatch $MAKEDIR/glibc* $LFSSOURCE/$SRCPATH/glibc-*-blowfish*
-	SrcPatch $MAKEDIR/glibc* $LFSSOURCE/$SRCPATH/glibc-*-dl_execstack_PaX*
-	SrcPatch $MAKEDIR/glibc* $LFSSOURCE/$SRCPATH/glibc-*-iconv_unnest-1*
-	SrcPatch $MAKEDIR/glibc* $LFSSOURCE/$SRCPATH/glibc-*-pt_pax-1*
-	SrcPatch $MAKEDIR/glibc* $LFSSOURCE/$SRCPATH/glibc-*-strlcpy_strlcat-1*
 	mkdir ../build-glibc
 	cd ../build-glibc
 }
 
 mk32() {
+	ARCH=`echo $TARGET32|cut -d"-" -f 1`
 	CC="gcc -m32" \
 	CXX="g++ -m32" \
+	CFLAGS="-march=$ARCH -mtune=generic -O2" \
 	../glibc*/configure --prefix=/usr \
 	                    --host=${TARGET32} \
 			    --disable-profile \
@@ -96,6 +92,7 @@ mk32() {
 			    --enable-kernel=2.6.0 \
 			    --libexecdir=/usr/lib/glibc 
 	make -j $NUMCPU
+	touch /etc/ld.so.conf
 	make -j $NUMCPU install_root=$TMPROOT install
 	cd ../glibc*
 	rm -r ../build-glibc/
@@ -104,6 +101,7 @@ mk32() {
 }
 	
 mk() {
+	ARCH=`echo $TARGET|cut -d"-" -f 1`
 	if [ $MK64BIT == "true" ]; then
 		echo "slibdir=/lib64" >> configparms
 		ADDCONFIGURE="--libdir=/usr/lib64 --libexecdir=/usr/lib64/glibc"
@@ -129,6 +127,4 @@ mk() {
 postmk() {
 	cd ../glibc*
 	rm -r ../build-glibc
-	tar -C /tools/share/zoneinfo -cf - .|\
-	tar -C $TMPROOT/usr/share/zoneinfo -xf - 
 }