diff --git a/BaseBuild/Basesys/Basesys.dmk b/BaseBuild/Basesys/Basesys.dmk index 28d4753..1fe186c 100644 --- a/BaseBuild/Basesys/Basesys.dmk +++ b/BaseBuild/Basesys/Basesys.dmk @@ -40,7 +40,7 @@ 16 Basesys/linux-headers 16 Basesys/man-pages 16 Basesys/man-pages-de -16 Basesys/glibc +16 Basesys/eglibc 16 Basesys/adjust 16 Basesys/gmp 16 Basesys/mpfr diff --git a/BaseBuild/Basesys/glibc b/BaseBuild/Basesys/eglibc similarity index 76% rename from BaseBuild/Basesys/glibc rename to BaseBuild/Basesys/eglibc index 5575047..c54fc92 100644 --- a/BaseBuild/Basesys/glibc +++ b/BaseBuild/Basesys/eglibc @@ -74,62 +74,69 @@ SRCPATH=Base/Lib (( MKPKG = $MKPKG | 128 )) premk() { - SrcPatch $MAKEDIR/glibc* $LFSSOURCE/$SRCPATH/glibc-*-localedef_segfault* - mkdir ../build-glibc - cd ../build-glibc + unset LINKER + mkdir -v ../build-eglibc } mk32() { + LINKER=$(readelf -l $(file /tools/lib/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p') + mv scripts/test-installation.pl{,.orig} + sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \ + scripts/test-installation.pl + cd ../build-eglibc ARCH=`echo $TARGET32|cut -d"-" -f 1` CC="gcc -m32" \ CXX="g++ -m32" \ CFLAGS="-march=$ARCH -mtune=generic -g -O2" \ - ../glibc*/configure --prefix=/usr \ - --host=${TARGET32} \ - --disable-profile \ - --enable-add-ons \ - --enable-kernel=2.6.0 \ - --libexecdir=/usr/lib/glibc + ../eglibc*/configure --prefix=/usr \ + --host=${TARGET32} \ + --disable-profile \ + --enable-add-ons \ + --enable-kernel=2.6.0 \ + --libexecdir=/usr/lib/eglibc make -j $NUMCPU - sed -i '/cross-compiling/s@ifeq@ifneq@g' ../glibc-2.9/localedata/Makefile - MakeCheck -k check >glibc-check-log.32 2>&1; grep Error glibc-check-log.32 + sed -i '/cross-compiling/s@ifeq@ifneq@g' ../eglibc-*/localedata/Makefile + cp -v ../eglibc-*/iconvdata/gconv-modules iconvdata + MakeCheck -k check >/tmp/genpkg/glibc-check-log.32 2>&1 touch /etc/ld.so.conf make -j $NUMCPU install_root=$TMPROOT install - cd ../glibc* - rm -r ../build-glibc/ - mkdir ../build-glibc - cd ../build-glibc + cd ../eglibc* + rm -r ../build-eglibc/ + mv scripts/test-installation.pl.orig scripts/test-installation.pl + mkdir ../build-eglibc } mk() { - ARCH=`echo $TARGET|cut -d"-" -f 1` + LINKER=$(readelf -l $(file /tools/${LIBDIR}/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p') + sed -i "s|libs -o|libs -L/usr/${LIBDIR} -Wl,-dynamic-linker=${LINKER} -o|" \ + scripts/test-installation.pl + cd ../build-eglibc if [ $MK64BIT == "true" ]; then echo "slibdir=/lib64" >> configparms - ADDCONFIGURE="--libdir=/usr/lib64 --libexecdir=/usr/lib64/glibc" if echo $ARCH|grep -q sparc; then echo "Special doings for sparc ?" fi else - ADDCONFIGURE="--libexecdir=/usr/lib/glibc" BUILDOPTIONS=${BUILDOPTIONS}" -march=i486" fi - if [ ! ${MK64BIT} == "true" ]; then - echo "CFLAGS += -mtune=generic -g -O2" >configparms - fi CC="gcc ${BUILDOPTIONS}" \ CXX="g++ ${BUILDOPTIONS}" \ - ../glibc*/configure --prefix=/usr \ + CFLAGS="-mtune=generic -g -O2" \ + ../eglibc*/configure --prefix=/usr \ $ADDCONFIGURE \ --disable-profile \ --enable-add-ons \ - --enable-kernel=2.6.0 + --enable-kernel=2.6.0 \ + --libexecdir=/usr/${LIBDIR}/eglibc \ + --libdir=/usr/${LIBDIR} make -j $NUMCPU - MakeCheck -k check >glibc-check-log 2>&1; grep Error glibc-check-log + cp -v ../eglibc-*/iconvdata/gconv-modules iconvdata + MakeCheck -k check >>/tmp/genpkg/eglibc-check-log 2>&1 make -j $NUMCPU install_root=$TMPROOT install make -j $NUMCPU install_root=$TMPROOT localedata/install-locales } postmk() { - cd ../glibc* - rm -r ../build-glibc + cd ../eglibc* + rm -r ../build-eglibc } diff --git a/BaseBuild/Basesys/gmp b/BaseBuild/Basesys/gmp index 6344d06..5517e84 100644 --- a/BaseBuild/Basesys/gmp +++ b/BaseBuild/Basesys/gmp @@ -75,16 +75,19 @@ SRCPATH=Base/Lib premk() { + mv config{fsf,}.guess + mv config{fsf,}.sub mkdir ../build-gmp cd ../build-gmp } mk32() { + CPPFLAGS=-fexceptions \ CC="gcc -isystem /usr/include ${BUILDOPTIONS32}" \ CXX="g++ -isystem /usr/include ${BUILDOPTIONS32}" \ LDFLAGS="-Wl,-rpath-link,/lib ${BUILDOPTIONS32}" \ - ../gmp*/configure --host=$TARGET32 \ - --prefix=/usr \ + ABI=32 \ + ../gmp*/configure --prefix=/usr \ --enable-cxx \ --enable-mpbsd make -j $NUMCPU @@ -98,14 +101,11 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/lib64" - fi + CPPFLAGS=-fexceptions \ CC="gcc -isystem /usr/include ${BUILDOPTIONS}" \ CXX="g++ -isystem /usr/include ${BUILDOPTIONS}" \ LDFLAGS="-Wl,-rpath-link,/$LIBDIR ${BUILDOPTIONS}" \ - ../gmp*/configure --host=$TARGET \ - $ADDOPTIONS \ + ../gmp*/configure --libdir=/usr/${LIBDIR} \ --prefix=/usr \ --enable-cxx \ --enable-mpbsd diff --git a/BaseBuild/Basesys/man-pages b/BaseBuild/Basesys/man-pages index 90ae5da..d33e995 100644 --- a/BaseBuild/Basesys/man-pages +++ b/BaseBuild/Basesys/man-pages @@ -69,12 +69,12 @@ SRCPATH=Base/System premk() { -mkdir -p $TMPROOT/usr/share/man -mkdir $TMPROOT/usr/share/man/man{1,2,3,4,5,6,7,8} + mkdir -p $TMPROOT/usr/share/man + mkdir $TMPROOT/usr/share/man/man{1,2,3,4,5,6,7,8} } mk() { -make MANDIR=$TMPROOT/usr/share/man install + make MANDIR=$TMPROOT/usr/share/man install } postmk() { diff --git a/BaseBuild/Basesys/man-pages-de b/BaseBuild/Basesys/man-pages-de index 3bf1637..e124266 100644 --- a/BaseBuild/Basesys/man-pages-de +++ b/BaseBuild/Basesys/man-pages-de @@ -71,12 +71,12 @@ SRCPATH=Base/System SRCDIR="manpages-de*" premk() { -mkdir -p $TMPROOT/usr/share/man -mkdir $TMPROOT/usr/share/man/man{1,2,3,4,5,6,7,8} + mkdir -p $TMPROOT/usr/share/man + mkdir $TMPROOT/usr/share/man/man{1,2,3,4,5,6,7,8} } mk() { -make MANDIR=$TMPROOT/usr/share/man install + make MANDIR=$TMPROOT/usr/share/man install } postmk() { diff --git a/BaseBuild/testchain/tree b/BaseBuild/Basesys/mpc similarity index 68% rename from BaseBuild/testchain/tree rename to BaseBuild/Basesys/mpc index 17a5244..b5fa559 100644 --- a/BaseBuild/testchain/tree +++ b/BaseBuild/Basesys/mpc @@ -3,7 +3,7 @@ #dieses Framework wird im CVS Repository #:pserver:cvs.tramp-bbs.de:/opt/cvs zur Verfügung gestellt # -#Lage dieser Datei im Archiv: $HeadURL$ +#Lage dieser Datei im Archiv: $HeadURL: svn://svn.compuextreme.de/Viitor/V963/ViitorMake/BaseBuild/toolchain/mpc $ # #(c) 2003 Harald Kueller, Germany #This program is free software; you can redistribute it and/or @@ -56,39 +56,66 @@ # frisch installierten Packet verwendet (wie z.B. postgresql) # 64 : sourcetree aufräumen nach packeterstellung unterbinden. # -# 128 : Patches zu den Sourcen nicht einspielen - Module muss sich darum -# kümmern - -#Module zur Erstellung des Packetes: (Basesys) -#Quelle der Source Archive: -#Kurzbeschreibung: +#Module zur Erstellung des Packetes: mpc +#Quelle der Source Archive: http://www.multiprecision.org/ +#Kurzbeschreibung: +#Library zur Berechnung von Komplexen Zahlen mit hoher präzition und +#korrekter rundung # -#Letzte Änderung von: $Author$ -#Datum der letzten Änderung: $Date$ -#Version der Datei: $Revision$ +#Letzte Änderung von: $Author: kueller $ +#Datum der letzten Änderung: $Date: 2011-02-25 12:22:50 +0100 (Fr, 25. Feb 2011) $ +#Version der Datei: $Rev: 5996 $ # -SRCPATH=Base/Utilities +#Pfad zum Basis-Sourcetree : +SRCPATH=Base/Lib -(( MKPKG = $MKPKG | 8 )) -(( MKPKG = $MKPKG | 16 )) +#Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist +#SRCDIR= -#Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen -#ausgeführt (sprich unpack src; cd src; premk) -#Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen premk() { echo "Nothing to do for premk()" } -#Hier wird der Make Prozess der Sourcen definiert -mk() { - make -j $NUMCPU CC="gcc ${BUILDOPTIONS}" - make -j $NUMCPU prefix=/tools install +mk32() { + CC="gcc -isystem /usr/include ${BUILDOPTIONS32}" \ + LDFLAGS="-Wl,-rpath-link,/lib ${BUILDOPTIONS32}" \ + ./configure --prefix=/usr \ + --host=${TARGET32} + + CheckError "Configurescript failed !" 1 + + # Make-Optionen eintragen + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + # Make install Optionen eintragen + make -j $NUMCPU DESTDIR=$TMPROOT install + CheckError "Make install process failed !" 1 + + make distclean + echo "Cleaned Up" + read +} + +mk() { + CC="gcc -isystem /usr/include ${BUILDOPTIONS}" \ + LDFLAGS="-Wl,-rpath-link,/${LIBDIR} ${BUILDOPTIONS}" \ + ./configure --prefix=/usr \ + --libdir=/tools/${LIBDIR} + + CheckError "Configurescript failed !" 1 + + # Make-Optionen eintragen + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + # Make install Optionen eintragen + make -j $NUMCPU DESTDIR=$TMPROOT install + CheckError "Make install process failed !" 1 } -#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann -#in $TMPROOT noch einiges korrigieren postmk() { echo "Nothing to do for postmk()" } diff --git a/BaseBuild/Basesys/mpfr b/BaseBuild/Basesys/mpfr index 879da61..9b2531f 100644 --- a/BaseBuild/Basesys/mpfr +++ b/BaseBuild/Basesys/mpfr @@ -96,12 +96,10 @@ mk32() { mk() { CC="gcc -isystem /usr/include ${BUILDOPTIONS}" \ CXX="g++ -isystem /usr/include ${BUILDOPTIONS}" \ - LDFLAGS="-Wl,-rpath-link,/$LIBDIR ${BUILDOPTIONS}" \ - ../mpfr*/configure --host=$TARGET \ - --build=$HOSTSYS \ - --prefix=/usr \ - --libdir=/usr/$LIBDIR \ - --enable-shared \ + LDFLAGS="-Wl,-rpath-link,/${LIBDIR} ${BUILDOPTIONS}" \ + ../mpfr*/configure --prefix=/usr \ + --libdir=/usr/${LIBDIR}\ + --enable-shared \ CheckError "Configurescript failed !" 1 diff --git a/BaseBuild/testchain/expect b/BaseBuild/testchain/expect index ebede8e..01a92ea 100644 --- a/BaseBuild/testchain/expect +++ b/BaseBuild/testchain/expect @@ -79,9 +79,7 @@ SRCPATH=Base/Development #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen premk() { - sed -i '/EXP_LIB_SPEC=/s@${exec_prefix}/lib@${libdir}@' configure - sed -i '1i\#include ' Dbg.c - sed -i "s/tcl.h/tclInt.h/" exp_inter.c + echo "Nothing to do for premk()" } #Hier wird der Make Prozess der Sourcen definiert @@ -93,9 +91,9 @@ mk() { fi CC="gcc ${BUILDFLAGS}" \ ./configure --prefix=/tools \ - $ADDCONFIGURE \ - --with-tcl=/tools/$LIBDIR \ - --with-tclinclude=/tools/include && + --with-tcl=/tools/${LIBDIR} \ + --with-tclinclude=/tools/include \ + --libdir=/tools/${LIBDIR} && make -j $NUMCPU && make -j $NUMCPU SCRIPTS="" install } diff --git a/BaseBuild/testchain/perl b/BaseBuild/testchain/perl index 1184428..acf8642 100644 --- a/BaseBuild/testchain/perl +++ b/BaseBuild/testchain/perl @@ -72,14 +72,12 @@ 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) #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen premk() { - SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-libc-*.patch* PROGNAME=`ls -d ../perl*` PROGVER=`echo $PROGNAME|cut -d"-" -f 2` sed -i 's@/usr/include@/tools/include@g' ext/Errno/Errno_pm.PL @@ -87,11 +85,9 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { - ./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' -Dcc="gcc -m32" - make -j $NUMCPU perl utilities - cp -v perl pod/pod2man /tools/bin - install -dv /tools/lib/perl5/$PROGVER - cp -Rv lib/* /tools/lib/perl5/$PROGVER + ./configure.gnu --prefix=/tools -Dcc="gcc -m32" + make -j $NUMCPU + make -j $NUMCPU install ln -sv /tools/bin/perl /usr/bin } diff --git a/BaseBuild/testchain/tcl b/BaseBuild/testchain/tcl index d20ceed..8988b22 100644 --- a/BaseBuild/testchain/tcl +++ b/BaseBuild/testchain/tcl @@ -84,11 +84,8 @@ premk() { #Hier wird der Make Prozess der Sourcen definiert mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/tools/lib64" - fi CC="gcc ${BUILDFLAGS}" \ - ./configure ${ADDOPTIONS} \ + ./configure --libdir=/tools/${LIBDIR} --prefix=/tools && make -j $NUMCPU && make -j $NUMCPU install && diff --git a/BaseBuild/testchain/testchain.dmk b/BaseBuild/testchain/testchain.dmk index 2d4128a..79a166a 100644 --- a/BaseBuild/testchain/testchain.dmk +++ b/BaseBuild/testchain/testchain.dmk @@ -1,5 +1,4 @@ 16 testchain/tcl 16 testchain/expect 16 testchain/dejagnu -16 testchain/tree 16 testchain/perl