Anpassung an Version V963, Einarbeitung der neuesten CLFS Version

git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6018 504e572c-2e33-0410-9681-be2bf7408885
2011-03-03 13:12:12 +00:00 · 2011-03-03 13:12:12 +00:00 · 9debcb06b0
commit 9debcb06b0
parent 0b3c646d61
13 changed files with 64 additions and 82 deletions
--- a/BaseBuild/Basesys/autoconf
+++ b/BaseBuild/Basesys/autoconf
@ -77,6 +77,7 @@ mk() {
 	CC="gcc ${BUILDOPTIONS}" \
 	./configure --prefix=/usr
 	make -j $NUMCPU
+	MakeCheck VERBOSE=yes
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }

--- a/BaseBuild/Basesys/bash
+++ b/BaseBuild/Basesys/bash
@ -84,8 +84,7 @@ mk() {
 		    --with-installed-readline
 	make -j $NUMCPU
 	make htmldir=$TMPROOT/usr/share/doc/bash-4.0 \
-	     prefix=$TMPROOT/usr \
-	     bindir=$TMPROOT/bin install
+	     DESTDIR=$TMPROOT install
 }


--- a/BaseBuild/Basesys/bzip2
+++ b/BaseBuild/Basesys/bzip2
@ -108,25 +108,17 @@ mk() {

 postmk() {
 	mkdir -p $TMPROOT/bin $TMPROOT/usr/share/man/man1 $TMPROOT/lib
-	WDIR=`pwd`
 	cp bzip2-shared $TMPROOT/bin/bzip2
 	if [ "$MK64BIT" == "true" ]; then
 		mkdir $TMPROOT/lib64
-		cp -a libbz2.so* libbz2.a $TMPROOT/lib64
-		ln -sf ../../lib64/libbz2.so.1.0 $TMPROOT/usr/lib64/libbz2.so
-	else
-		cp -a libbz2.so* libbz2.a $TMPROOT/lib
-		ln -sf ../../lib/libbz2.so.1.0 $TMPROOT/usr/lib/libbz2.so
 	fi
-	cd $TMPROOT/usr/bin
-	rm bunzip2 bzcat bzip2 
-	mv bzip2recover bzless bzmore $TMPROOT/bin
-	cd $TMPROOT/bin
-	ln -sf bzip2 bunzip2
-	ln -sf bzip2 bzcat
-	cd $TMPROOT/usr/share/man/man1
-	ln -s bzip2.1 bunzip2.1
-	ln -s bzip2.1 bzcat.1
-	ln -s bzip2.1 bzip2recover.1
-	cd $WDIR
+	cp -a libbz2.so* libbz2.a $TMPROOT/${LIBDIR}
+	ln -sf ../../${LIBDIR}/libbz2.so.1.0 $TMPROOT/usr/${LIBDIR}/libbz2.so
+	rm $TMPROOT/usr/bin/{bunzip2,bzcat,bzip2}
+	mv $TMPROOT/usr/bin/{bzip2recover,bzless,bzmore} $TMPROOT/bin
+	ln -sf bzip2 $TMPROOT/bin/bunzip2
+	ln -sf bzip2 $TMPROOT/bin/bzcat
+	ln -s bzip2.1 $TMPROOT/usr/share/man/man1/bunzip2.1
+	ln -s bzip2.1 $TMPROOT/usr/share/man/man1/bzcat.1
+	ln -s bzip2.1 $TMPROOT/usr/share/man/man1/bzip2recover.1
 }
--- a/BaseBuild/Basesys/diffutils
+++ b/BaseBuild/Basesys/diffutils
@ -77,9 +77,8 @@ mk() {
 	CC="gcc ${BUILDOPTIONS}" \
 	./configure --prefix=/usr
 	sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' config.h
-	touch man/*.1
 	make -j $NUMCPU
-	make -j $NUMCPU prefix=$TMPROOT/usr install
+	make -j $NUMCPU DESTDIR=$TMPROOT install
 }

 postmk() {
--- a/BaseBuild/Basesys/file
+++ b/BaseBuild/Basesys/file
@ -93,13 +93,10 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	CC="gcc ${BUILDOPTIONS}" \
 	../file*/configure --prefix=/usr \
-		    $ADDOPTIONS \
-		    --datadir=/usr/share/misc
+			   --libidr=/usr/${LIBDIR} \
+			   --datadir=/usr/share/misc
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
--- a/BaseBuild/Basesys/findutils
+++ b/BaseBuild/Basesys/findutils
@ -78,11 +78,11 @@ premk() {

 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --libexecdir=/usr/$LIBDIR/locate \
+	./configure --libexecdir=/usr/$LIBDIR/locate \
 		    --localstatedir=/var/$LIBDIR/locate \
 		    --prefix=/usr 
 	make -j $NUMCPU
+	MakeCheck -j $NUMCPU check
 	make -j $NUMCPU install
 	make -j $NUMCPU prefix=$TMPROOT/usr \
 	                libexecdir=$TMPROOT/usr/$LIBDIR/locate \
--- a/BaseBuild/Basesys/flex
+++ b/BaseBuild/Basesys/flex
@ -80,7 +80,7 @@ premk() {
 mk32() {
 	CC="gcc ${BUILDOPTIONS32}" \
 	../flex*/configure --prefix=/usr
-	make -j $NUMCPU libfl.a
+	make -j $NUMCPU libfl.a libfl_pic.a
 	make -j $NUMCPU prefix=$TMPROOT/usr install-libLIBRARIES
 	cd ../flex*
 	rm -r ../build-flex
@ -90,12 +90,11 @@ mk32() {

 mk() {
 	if [ "$MK64BIT" == "true" ]; then
-		$ADDOPTIONS="--libdir=/usr/lib64"
 		mkdir -p $TMPROOT/usr/lib64
 		INSTOPT="libdir=$TMPROOT/usr/lib64"
 	fi
 	CC="gcc ${BUILDOPTIONS}" \
-	../flex*/configure $ADDOPTIONS \
+	../flex*/configure --libdir=/usr/${LIBDIR} \
 		    	   --prefix=/usr &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU prefix=$TMPROOT/usr $INSTOPT install
--- a/BaseBuild/Basesys/gawk
+++ b/BaseBuild/Basesys/gawk
@ -76,13 +76,8 @@ premk() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libexecdir=/usr/lib64"
-	else
-		ADDOPTIONS="--libexecdir=/usr/lib"
-	fi
 	./configure --host=$TARGET \
-		    $ADDOPTIONS \
+		    --libexecdir=/usr/${LIBDIR} \
 		    --prefix=/usr &&
 	make -j $NUMCPU &&
 	make -j $NUMCPU DESTDIR=$TMPROOT install
@ -98,5 +93,7 @@ postmk() {
 	ln -sf ../../bin/gawk $TMPROOT/usr/bin/iawk
 	ln -sf ../../bin/gawk $TMPROOT/usr/bin/pgawk
 	ln -sf ../../bin/gawk $TMPROOT/usr/bin/pawk
+	ln $TMPROOT/bin/gawk $TMPROOT/usr/bin/gawk-3.1.8
+	ln $TMPROOT/usr/bin/pgawk $TMPROOT/usr/bin/pgawk-3.1.8
 	rm -r $TMPROOT/usr/man
 }
--- a/BaseBuild/Basesys/gettext
+++ b/BaseBuild/Basesys/gettext
@ -87,13 +87,11 @@ mk32() {
 }

 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=/usr/lib64"
-	fi
 	../gettext*/configure --host=$TARGET \
-		    $ADDOPTIONS \
-		    --prefix=/usr
+			      --libdir=/usr/${LIBDIR} \
+			      --prefix=/usr
 	make -j $NUMCPU
+	MakeCheck -j $NUMCPU check
 	make install
 	make DESTDIR=$TMPROOT install
 }
--- a/BaseBuild/Basesys/iproute2
+++ b/BaseBuild/Basesys/iproute2
@ -82,14 +82,13 @@ premk() {
 mk() {
 	make -j $NUMCPU CC="gcc ${BUILDOPTIONS}" \
 			DESTDIR=/ \
-	                LIBDIR=/usr/$LIBDIR \
-			VARLIB=/var/$LIBDIR \
-			SBINDIR=/sbin \
+	                LIBDIR=/usr/${LIBDIR} \
+			VARLIB=/var/${LIBDIR} \
 			DOCDIR=/usr/share/doc/iproute2 \
 			MANDIR=/usr/share/man
 	make -j $NUMCPU DESTDIR=$TMPROOT \
-		LIBDIR=/usr/$LIBDIR \
-		VARLIB=/var/$LIBDIR \
+		LIBDIR=/usr/${LIBDIR} \
+		VARLIB=/var/${LIBDIR} \
 		SBINDIR=/sbin \
 		DOCDIR=/usr/share/doc/iproute2 \
 		MANDIR=/usr/share/man install
@ -98,5 +97,7 @@ mk() {
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
 #in $TMPROOT noch einiges korrigieren
 postmk() {
-	GetSVN Viitor_iproute $TMPROOT
+	if [ -d /var/install/subversion* ]; then
+		GetSVN Viitor_iproute $TMPROOT
+	fi
 }
--- a/BaseBuild/Basesys/perl
+++ b/BaseBuild/Basesys/perl
@ -73,12 +73,10 @@ SRCPATH=Base/Development
 premk() {
 	mkdir -p $TMPROOT/usr/share
 	mkdir -p $TMPROOT/usr/bin
-	echo "127.0.0.1 localhost $(hostname)" >/etc/hosts
-	sed -i -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
-	  -e "s@static_target='static'@static_target='static_pic'@g" Makefile.SH
-	sed -i -e '/^BUILD_ZLIB/ s/True/False/' \
-	       -e '/^INCLUDE\|^LIB/ s|\./zlib-src|/usr/include|' \
-	           ext/Compress/Raw/Zlib/config.in
+	sed -i -e '/^BUILD_ZLIB/s/True/False/' \
+	       -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
+	       -e '/^LIB/s,\./zlib-src,/usr/lib,' \
+	       cpan/Compress-Raw-Zlib/config.in
 	if [ ! -f /etc/hosts ]; then
 		echo "127.0.0.1 localhost $(hostname)" >/etc/hosts
 	fi
@ -94,19 +92,18 @@ mk32() {
 			-Dusethreads \
 			-Duseshrplib 
 	make -j $NUMCPU
+	make -j $NUMCPU install
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	mv $TMPROOT/usr/bin/perl{,-32}
-	mv $TMPROOT/usr/bin/perl5.10.0{,-32}
+	mv $TMPROOT/usr/bin/perl5.12.2{,-32}
 	rm -r $MAKEDIR/perl-*
 	UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/perl-*.tar*
 	cd $MAKEDIR/perl*
-	sed -i -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
-	  -e "s@static_target='static'@static_target='static_pic'@g" Makefile.SH
-	sed -i -e '/^BUILD_ZLIB/ s/True/False/' \
-	       -e '/^INCLUDE\|^LIB/ s|\./zlib-src|/usr/include|' \
-	           ext/Compress/Raw/Zlib/config.in
+	sed -i -e '/^BUILD_ZLIB/s/True/False/' \
+	       -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
+	       -e '/^LIB/s,\./zlib-src,/usr/lib,' \
+	       cpan/Compress-Raw-Zlib/config.in
 	SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-Configure_multilib-?.patch.*
-	SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-libc-*.patch*
 	sed -i "/libc/s@/lib@/lib64@" hints/linux.sh
 	echo 'installstyle="lib64/perl5"' >>hints/linux.sh
 }
@ -118,20 +115,21 @@ mk() {
 			-Dman3dir=/usr/share/man/man3 \
 			-Dpager="/bin/less -isR" \
 			-Dlibpath="/usr/local/$LIBDIR /$LIBDIR /usr/$LIBDIR" \
-			-Dcc="gcc -m$UARCH" \
+			-Dcc="gcc -m${UARCH}" \
 			-Dusethreads \
 			-Duseshrplib
-	make 
-	MakeCheck test
+	make  -j $NUMCPU
+	MakeCheck -j $NUMCPU test
+	make install
 	make DESTDIR=$TMPROOT install
 }

 postmk() {
 	if [ ${MK64BIT} == "true" ]; then
 		mv $TMPROOT/usr/bin/perl{,-64}
-		mv $TMPROOT/usr/bin/perl5.10.0{,-64}
+		mv $TMPROOT/usr/bin/perl5.12.2{,-64}
 		ln -sv /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/perl
-		ln -sv /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/perl5.10.0
+		ln -sv /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/perl5.12.2
 	else	
 		echo "Nothing to do for postmk() "
 	fi
--- a/BaseBuild/Basesys/readline
+++ b/BaseBuild/Basesys/readline
@ -77,20 +77,19 @@ SRCPATH=Base/Lib
 premk() {
 	mkdir ../build-readline
 	cd ../build-readline
-	sed -i 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncursesw:' support/shobj-conf
 }

 #Hier wird der Make Prozess der Sourcen definiert
 mk32() {
-	CC="gcc ${BUILDOPTIONS32} -fPIC" \
-	CXX="g++ ${BUILDOPTIONS32} -fPIC" \
+	CC="gcc ${BUILDOPTIONS32}" \
+	CXX="g++ ${BUILDOPTIONS32}" \
 	../readline*/configure --prefix=/usr \
 			       --libdir=/lib
-	make -j $NUMCPU 
-	make -j $NUMCPU install
-	make -j $NUMCPU install-doc
-	make -j $NUMCPU DESTDIR=$TMPROOT install
-	make -j $NUMCPU DESTDIR=$TMPROOT install-doc
+	make -j $NUMCPU SHLIB_LIBS=-lncurses
+	make install
+	make install-doc
+	make DESTDIR=$TMPROOT install
+	make DESTDIR=$TMPROOT install-doc
 	mv -v /lib/lib{readline,history}.a /usr/lib
 	rm -v /lib/lib{readline,history}.so
 	ln -svf ../../lib/libreadline.so.6 /usr/lib/libreadline.so
@ -106,15 +105,15 @@ mk32() {
 	}

 mk() {
-	CC="gcc ${BUILDOPTIONS} -fPIC" \
-	CXX="g++ ${BUILDOPTIONS} -fPIC" \
-	../readline*/configure --libdir=/$LIBDIR \
+	CC="gcc ${BUILDOPTIONS}" \
+	CXX="g++ ${BUILDOPTIONS}" \
+	../readline*/configure --libdir=/${LIBDIR} \
 		               --prefix=/usr 
-	make -j $NUMCPU &&
-	make -j $NUMCPU install &&
-	make -j $NUMCPU install-doc &&
-	make -j $NUMCPU DESTDIR=$TMPROOT install &&
-	make -j $NUMCPU DESTDIR=$TMPROOT install-doc
+	make -j $NUMCPU SHLIB_LIBS=-lncurses &&
+	make install &&
+	make install-doc &&
+	make DESTDIR=$TMPROOT install &&
+	make DESTDIR=$TMPROOT install-doc
 	mv -v /$LIBDIR/lib{readline,history}.a /usr/$LIBDIR
 	rm -v /$LIBDIR/lib{readline,history}.so
 	ln -svf ../../$LIBDIR/libreadline.so.6 /usr/$LIBDIR/libreadline.so
--- a/BaseBuild/testchain/perl
+++ b/BaseBuild/testchain/perl
@ -72,6 +72,7 @@ SRCPATH=Base/Development

 (( MKPKG = $MKPKG | 8 ))
 (( MKPKG = $MKPKG | 16 ))
+(( MKPKG = $MKPKG | 128 ))

 #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
 #ausgeführt (sprich unpack src; cd src; premk)
@ -81,6 +82,7 @@ premk() {
 	PROGNAME=`ls -d ../perl*`
 	PROGVER=`echo $PROGNAME|cut -d"-" -f 2`
 	sed -i 's@/usr/include@/tools/include@g' ext/Errno/Errno_pm.PL
+	SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-libc-?.patch.*
 }

 #Hier wird der Make Prozess der Sourcen definiert