From a519c39a41fb37df378978433388b540ddfdee56 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Wed, 14 May 2008 11:26:03 +0000
Subject: [PATCH] Anpassung an neue perl und neue Viitor Version

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4501 504e572c-2e33-0410-9681-be2bf7408885
---
 BaseBuild/Basesys/perl | 49 +++++++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/BaseBuild/Basesys/perl b/BaseBuild/Basesys/perl
index 8977ed3..ae8bd38 100644
--- a/BaseBuild/Basesys/perl
+++ b/BaseBuild/Basesys/perl
@@ -72,35 +72,60 @@ SRCPATH=Base/Development
 
 premk() {
 	mkdir -p $TMPROOT/usr/share
-	if [ "$MK64BIT" == "true" ];then
-		SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-Configure_multilib-1.patch*
-		SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-libc_lib64-1.patch*
-	fi
-	echo 'installstyle="lib64/perl5"' >>hints/linux.sh
+	mkdir -p $TMPROOT/usr/bin
+	SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-gcc42_fix-?.patch.*
 	echo "127.0.0.1 localhost $(hostname)" >/etc/hosts
-	sed -e "s/^ccflags=.*$/ccflags=\'-fPIC \'/" Configure >/tmp/Configure
-	mv /tmp/Configure .
-	chmod 755 Configure
+	sed -i -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
+	  -e "s@static_target='static'@static_target='static_pic'@g" Makefile.SH
+}
+
+mk32() {
+	./configure.gnu --prefix=/usr \
+	                -Dman1dir=/usr/share/man/man1 \
+			-Dman3dir=/usr/share/man/man3 \
+			-Dpager="/bin/less -isR" \
+			-Dgcc="gcc ${BUILDOPTIONS32}" \
+			-Dlibpath="/usr/local/lib /lib /usr/lib"  \
+			-Dusethreads
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mv $TMPROOT/usr/bin/perl{,-32}
+	mv $TMPROOT/usr/bin/perl5.8.8{,-32}
+	rm -r $MAKEDIR/perl-*
+	UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/perl-*.tar*
+	SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-gcc42_fix-?.patch.*
+	sed -i -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
+	  -e "s@static_target='static'@static_target='static_pic'@g" Makefile.SH
+	SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-Configure_multilib-?.patch.*
+	sed -i "/libc/s@/lib@/lib64@" hints/linux.sh
+	echo 'installstyle="lib64/perl5"' >>hints/linux.sh
 }
 
 mk() {
 	if [ "$MK64BIT" == "true" ]; then
 		ADDOPTIONS="-Dlibpath=\"/usr/local/lib64 /lib64 /usr/lib64\"" 
 	else
-		ADDOPTIONS="-Dlibpath=\"/usr/local/lib /lib /usr/lib\""
+		ADDOPTIONS="-Dlibpath=\"/usr/local/lib /lib /usr/lib\"" 
 	fi
 	./configure.gnu --prefix=/usr \
 	                -Dman1dir=/usr/share/man/man1 \
 			-Dman3dir=/usr/share/man/man3 \
 			-Dpager="/bin/less -isR" \
 			$ADDOPTIONS \
-			-Dcc="gcc ${BUILDOPTIONS} -fPIC" \
+			-Dcc="gcc ${BUILDOPTIONS}" \
 			-Dusethreads
-	make CC="gcc $BUILDOPTIONS -fPIC " -j $NUMCPU
+	make -j $NUMCPU
 	MakeCheck -j $NUMCPU test
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
-	echo "Nothing to do for premk() "
+	if [ ${MK64BIT} == "true" ]; then
+		mv $TMPROOT/usr/bin/perl{,-64}
+		mv $TMPROOT/usr/bin/perl5.8.8{,-64}
+		ln -sv /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/perl
+		ln -sv /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/perl5.8.8
+	else	
+		echo "Nothing to do for premk() "
+	fi
 }