diff --git a/BaseBuild/testchain/expect b/BaseBuild/testchain/expect index 2e24719..41d45de 100644 --- a/BaseBuild/testchain/expect +++ b/BaseBuild/testchain/expect @@ -85,13 +85,16 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { if [ "$MK64BIT" == "true" ]; then - ADDCONFIGURE="--libdir=/tools/lib64 -with-tcl=/tools/lib64" + ADDCONFIGURE="--libdir=/tools/lib64" + LIBDIR=lib64 else ADDCONFIGURE="--with-tcl=/tools/lib" + LIBDIR=lib fi CC="gcc ${BUILDFLAGS}" \ ./configure --prefix=/tools \ $ADDCONFIGURE \ + --with-tcl=/tools/$LIBDIR --with-tclinclude=/tools/include && make -j $NUMCPU && make -j $NUMCPU SCRIPTS="" install diff --git a/BaseBuild/testchain/perl b/BaseBuild/testchain/perl index c965153..c0c90a2 100644 --- a/BaseBuild/testchain/perl +++ b/BaseBuild/testchain/perl @@ -79,6 +79,7 @@ SRCPATH=Base/Development #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen premk() { + SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-gcc42_fix-1.patch* SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-libc-2.patch* PROGNAME=`ls -d ../perl*` PROGVER=`echo $PROGNAME|cut -d"-" -f 2` diff --git a/BaseBuild/testchain/tcl b/BaseBuild/testchain/tcl index b951fae..aa58777 100644 --- a/BaseBuild/testchain/tcl +++ b/BaseBuild/testchain/tcl @@ -80,10 +80,6 @@ SRCPATH=Base/Development premk() { cd unix - sed -i "s/relid'/relid/" configure - if [ "$MK64BIT" == "true" ]; then - sed -i 's@\$(prefix)/lib@\$(prefix/lib64@g' Makefile.in - fi } #Hier wird der Make Prozess der Sourcen definiert diff --git a/BaseBuild/testchain/testchain.dmk b/BaseBuild/testchain/testchain.dmk index d5101d9..2d4128a 100644 --- a/BaseBuild/testchain/testchain.dmk +++ b/BaseBuild/testchain/testchain.dmk @@ -1,6 +1,5 @@ 16 testchain/tcl 16 testchain/expect -16 testchain/file 16 testchain/dejagnu 16 testchain/tree 16 testchain/perl diff --git a/BaseBuild/testchain/tree b/BaseBuild/testchain/tree index 7954532..17a5244 100644 --- a/BaseBuild/testchain/tree +++ b/BaseBuild/testchain/tree @@ -83,7 +83,7 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { - make -j $NUMCPU + make -j $NUMCPU CC="gcc ${BUILDOPTIONS}" make -j $NUMCPU prefix=/tools install }