From 9081699a6479f5b9916bd4e56d5d164e97aa04a2 Mon Sep 17 00:00:00 2001 From: kueller Date: Fri, 27 Mar 2009 06:44:25 +0000 Subject: [PATCH] Anpassung an neue Version git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4564 504e572c-2e33-0410-9681-be2bf7408885 --- BaseBuild/Basesys/attr | 2 +- BaseBuild/Basesys/binutils | 11 +-- BaseBuild/Basesys/bison | 10 +-- BaseBuild/Basesys/bzip2 | 4 +- BaseBuild/Basesys/coreutils | 14 ++-- BaseBuild/Basesys/e2fsprogs | 7 +- BaseBuild/Basesys/flex | 3 +- BaseBuild/Basesys/gcc | 32 ++++----- BaseBuild/Basesys/glibc | 13 ++-- BaseBuild/Basesys/gmp | 46 +++++++++--- BaseBuild/Basesys/iproute2 | 9 ++- BaseBuild/Basesys/libtool | 21 +++--- BaseBuild/Basesys/m4 | 3 +- BaseBuild/Basesys/mpfr | 129 +++++++++++++++++++++++++++++++++ BaseBuild/Basesys/ncurses | 138 +++++++++++++++++++++++------------- BaseBuild/Basesys/procps | 1 - BaseBuild/Basesys/sed | 3 +- BaseBuild/Basesys/shadow | 2 +- BaseBuild/Basesys/unzip | 2 +- BaseBuild/Basesys/xfsprogs | 4 +- BaseBuild/Basesys/zlib | 46 ++++++------ 21 files changed, 346 insertions(+), 154 deletions(-) create mode 100644 BaseBuild/Basesys/mpfr diff --git a/BaseBuild/Basesys/attr b/BaseBuild/Basesys/attr index 6511339..9c7e7a0 100644 --- a/BaseBuild/Basesys/attr +++ b/BaseBuild/Basesys/attr @@ -84,7 +84,7 @@ mk() { PKGLIBDIR="lib" fi CC="gcc ${BUILDOPTIONS}" \ - CXX="gcc ${BUILDOPTIONS}" \ + CXX="g++ ${BUILDOPTIONS}" \ ./configure --host=$TARGET \ --build=$TARGET \ --target=$TARGET \ diff --git a/BaseBuild/Basesys/binutils b/BaseBuild/Basesys/binutils index c4b8695..ac939f5 100644 --- a/BaseBuild/Basesys/binutils +++ b/BaseBuild/Basesys/binutils @@ -73,9 +73,8 @@ SRCPATH=Base/Utilities (( MKPKG = $MKPKG | 128 )) premk() { - SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-branch_update-3* - SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-genscripts_multilib-1.patch* - sed -i 's/test -f $file/# test -f $file/' missing + SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-branch_update-*.patch* + SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-genscripts_multilib-*.patch* mkdir ../build-binutils cd ../build-binutils } @@ -84,13 +83,17 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDCONFIGURE="--libdir=/usr/lib64" fi - CC="gcc ${BUILDOPTIONS}" \ + CC="gcc -isystem /usr/include ${BUILDOPTIONS}" \ + LDFLAGS="-Wl,-rpath-link,/lib64:/lib ${BUILDOPTIONS}" \ ../binutils*/configure --prefix=/usr \ $ADDCONFIGURE \ --enable-shared \ --enable-64-bit-bfd make -j $NUMCPU configure-host make -j $NUMCPU tooldir=/usr + MakeCheck check + echo "Check Ready" + read make -j $NUMCPU tooldir=/usr DESTDIR=$TMPROOT install } diff --git a/BaseBuild/Basesys/bison b/BaseBuild/Basesys/bison index 3000908..e7571e8 100644 --- a/BaseBuild/Basesys/bison +++ b/BaseBuild/Basesys/bison @@ -86,8 +86,7 @@ mk() { ADDOPTIONS="--libdir=\${prefix}/lib64" fi CC="gcc ${BUILDOPTIONS}" - ./configure --host=$TARGET \ - $ADDOPTIONS \ + ./configure $ADDOPTIONS \ --prefix=/usr && make -j $NUMCPU && MakeCheck -j $NUMCPU check && @@ -96,12 +95,5 @@ mk() { postmk() { cd $TMPROOT/usr/bin - echo '#!/bin/sh' > yacc - echo '#Begin /usr/bin/yacc' >>yacc - echo '' >>yacc - echo '/usr/bin/bison -y $@' >>yacc - echo '' >>yacc - echo '#End /usr/bin/yacc' >>yacc - chmod 755 yacc mv $TMPROOT/usr/man $TMPROOT/usr/share } diff --git a/BaseBuild/Basesys/bzip2 b/BaseBuild/Basesys/bzip2 index c1d2112..a30eaf6 100644 --- a/BaseBuild/Basesys/bzip2 +++ b/BaseBuild/Basesys/bzip2 @@ -94,10 +94,10 @@ mk() { fi make -j $NUMCPU -f Makefile-libbz2_so \ CC="gcc -fPIC ${BUILDOPTIONS}" \ - CXX="gcc -fPIC ${BUILDOPTIONS}" + CXX="g++ -fPIC ${BUILDOPTIONS}" make -j $NUMCPU clean make -j $NUMCPU CC="gcc -fPIC ${BUILDOPTIONS}" \ - CXX="gcc -fPIC ${BUILDOPTIONS}" + CXX="g++ -fPIC ${BUILDOPTIONS}" make -j $NUMCPU PREFIX=/usr install make PREFIX=$TMPROOT/usr install rm $TMPROOT/usr/man diff --git a/BaseBuild/Basesys/coreutils b/BaseBuild/Basesys/coreutils index 054add8..7e5e6e6 100644 --- a/BaseBuild/Basesys/coreutils +++ b/BaseBuild/Basesys/coreutils @@ -73,23 +73,25 @@ SRCPATH=Base/System premk() { - sed -i "s/futimens/gl_&/" $(grep -lr futimens *) + echo "Nothing to do for premk()" } mk() { CC="gcc ${BUILDOPTIONS}" \ - ./configure --host=$TARGET \ - --prefix=/usr + ./configure --prefix=/usr \ + --enable-no-install-program=kill,uptime \ + --enable-install-program=hostname make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install } postmk() { mkdir $TMPROOT/bin - mv $TMPROOT/usr/bin/{basename,cat,chgrp,chmod,chown,cp,date} $TMPROOT/bin + mv $TMPROOT/usr/bin/{cat,chgrp,chmod,chown,cp,date} $TMPROOT/bin mv $TMPROOT/usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir,mknod} $TMPROOT/bin - mv $TMPROOT/usr/bin/{rm,rmdir,sync,sleep,stty,test} $TMPROOT/bin - mv $TMPROOT/usr/bin/{touch,true,uname,vdir,mv,pwd,true,uname} $TMPROOT/bin + mv $TMPROOT/usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} $TMPROOT/bin + mv $TMPROOT/usr/bin/{basename,head,install,nice} $TMPROOT/bin + mv $TMPROOT/usr/bin/{readlink,sleep,sync,test,touch} $TMPROOT/bin ln -s ../usr/bin/pwd $TMPROOT/bin/pwd mkdir -p $TMPROOT/usr/{sbin,share} mkdir $TMPROOT/sbin diff --git a/BaseBuild/Basesys/e2fsprogs b/BaseBuild/Basesys/e2fsprogs index 7596939..e71cd24 100644 --- a/BaseBuild/Basesys/e2fsprogs +++ b/BaseBuild/Basesys/e2fsprogs @@ -82,7 +82,6 @@ mk32() { ../e2fsprogs*/configure --prefix=/usr \ --with-root-prefix="" \ --enable-elf-shlibs \ - --disable-evms \ --with-cc="gcc ${BUILDOPTIONS32}" make -j $NUMCPU libs make -j $NUMCPU install-libs @@ -100,12 +99,10 @@ mk() { fi cd - gcc="gcc ${BUILDOPTIONS}" \ - ../e2fsprogs*/configure --host=$TARGET \ - --prefix=/usr \ + ../e2fsprogs*/configure --prefix=/usr \ --with-root-prefix="" \ --enable-elf-shlibs \ - --disable-evms \ - --with-cc="gcc ${BUILDOPTIONS}" + --with-cc="gcc ${BUILDOPTIONS32}" make -j $NUMCPU make -j $NUMCPU install make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/BaseBuild/Basesys/flex b/BaseBuild/Basesys/flex index 86a4f7d..f4b4617 100644 --- a/BaseBuild/Basesys/flex +++ b/BaseBuild/Basesys/flex @@ -95,8 +95,7 @@ mk() { INSTOPT="libdir=$TMPROOT/usr/lib64" fi CC="gcc ${BUILDOPTIONS}" \ - ../flex*/configure --host=$TARGET \ - $ADDOPTIONS \ + ../flex*/configure $ADDOPTIONS \ --prefix=/usr && make -j $NUMCPU && make -j $NUMCPU prefix=$TMPROOT/usr $INSTOPT install diff --git a/BaseBuild/Basesys/gcc b/BaseBuild/Basesys/gcc index cbfe1ce..501b30c 100644 --- a/BaseBuild/Basesys/gcc +++ b/BaseBuild/Basesys/gcc @@ -73,10 +73,8 @@ SRCPATH=Base/Development (( MKPKG = $MKPKG | 128 )) premk() { - SrcPatch $MAKEDIR/gcc* $LFSSOURCE/$SRCPATH/gcc-*-branch_update-2.patch* - SrcPatch $MAKEDIR/gcc* $LFSSOURCE/$SRCPATH/gcc-*-PR31490-1.patch* + SrcPatch $MAKEDIR/gcc* $LFSSOURCE/$SRCPATH/gcc-*-branch_update-*.patch* sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in mkdir ../build-gcc cd ../build-gcc } @@ -85,22 +83,23 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDCONFIGURE="--libdir=/usr/lib64 --libexecdir=/usr/lib64" LIBDIR=lib64 + RPATH="/lib64:/lib" else ADDCONFIGURE="--libexecdir=/usr/lib" + RPATH="/lib" fi - CC="gcc ${BUILDOPTIONS}" \ - CXX="gcc ${BUILDOPTIONS}" \ - ../gcc*/configure --host=$TARGET \ - --prefix=/usr \ - $ADDCONFIGURE \ - --enable-shared \ - --enable-threads=posix \ - --enable-__cxa_atexit \ - --enable-c99 \ - --enable-long-long \ - --enable-clocale=gnu \ - --disable-libstdcxx-pch - make -j $NUMCPU bootstrap + CC="gcc -Wl,-rpath-link,$RPATH -isystem /usr/include ${BUILDOPTIONS}" \ + CXX="g++ -Wl,-rpath-link,$RPATH -isystem /usr/include ${BUILDOPTIONS}" \ + ../gcc*/configure --prefix=/usr \ + $ADDCONFIGURE \ + --enable-shared \ + --enable-threads=posix \ + --enable-__cxa_atexit \ + --enable-c99 \ + --enable-long-long \ + --enable-clocale=gnu \ + --disable-libstdcxx-pch + make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install } @@ -112,4 +111,5 @@ postmk() { ln -sv gcc $TMPROOT/usr/bin/cc cd ../gcc* rm -r ../build-gcc + read } diff --git a/BaseBuild/Basesys/glibc b/BaseBuild/Basesys/glibc index 9aa3999..4c3feb7 100644 --- a/BaseBuild/Basesys/glibc +++ b/BaseBuild/Basesys/glibc @@ -74,7 +74,6 @@ SRCPATH=Base/lib (( MKPKG = $MKPKG | 128 )) premk() { - SrcPatch $MAKEDIR/glibc* $LFSSOURCE/$SRCPATH/glibc-*-branch_update-1A* SrcPatch $MAKEDIR/glibc* $LFSSOURCE/$SRCPATH/glibc-*-localedef_segfault* mkdir ../build-glibc cd ../build-glibc @@ -84,7 +83,7 @@ mk32() { ARCH=`echo $TARGET32|cut -d"-" -f 1` CC="gcc -m32" \ CXX="g++ -m32" \ - CFLAGS="-march=$ARCH -mtune=generic -O2" \ + CFLAGS="-march=$ARCH -mtune=generic -g -O2" \ ../glibc*/configure --prefix=/usr \ --host=${TARGET32} \ --disable-profile \ @@ -92,6 +91,8 @@ mk32() { --enable-kernel=2.6.0 \ --libexecdir=/usr/lib/glibc 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 touch /etc/ld.so.conf make -j $NUMCPU install_root=$TMPROOT install cd ../glibc* @@ -111,18 +112,18 @@ mk() { else ADDCONFIGURE="--libexecdir=/usr/lib/glibc" fi + if [ ! ${MK64BIT} == "true" ]; then + echo "CFLAGS += -mtune=generic -g -O2" >configparms + fi CC="gcc ${BUILDOPTIONS}" \ CXX="g++ ${BUILDOPTIONS}" \ ../glibc*/configure --prefix=/usr \ - --host=${TARGET} \ $ADDCONFIGURE \ --disable-profile \ --enable-add-ons \ --enable-kernel=2.6.0 - if [ ! ${MK64BIT} == "true" ]; then - echo "CFLAGS += -march=$ARCH -mtune=generic -g -O2" >configparms - fi make -j $NUMCPU + MakeCheck -k check >glibc-check-log 2>&1; grep Error glibc-check-log make -j $NUMCPU install_root=$TMPROOT install make -j $NUMCPU install_root=$TMPROOT localedata/install-locales } diff --git a/BaseBuild/Basesys/gmp b/BaseBuild/Basesys/gmp index a163452..1bfcd0e 100644 --- a/BaseBuild/Basesys/gmp +++ b/BaseBuild/Basesys/gmp @@ -80,11 +80,17 @@ premk() { } mk32() { - CC="gcc ${BUILDOPTIONS32}" \ - CXX="gcc ${BUILDOPTIONS32}" \ - ../gmp*/configure --prefix=/ + CC="gcc -isystem /usr/include ${BUILDOPTIONS32}" \ + CXX="g++ -isystem /usr/include ${BUILDOPTIONS32}" \ + LDFLAGS="-Wl,-rpath-link,/lib ${BUILDOPTIONS32}" \ + ../gmp*/configure --host=$TARGET32 \ + --prefix=/usr \ + --enable-cxx \ + --enable-mpbsd make -j $NUMCPU + MakeCheck check make -j $NUMCPU DESTDIR=$TMPROOT install + mv -v $TMPROOT/usr/include/gmp{,-32}.h cd ../gmp* rm -r ../build-gmp mkdir ../build-gmp @@ -93,13 +99,19 @@ mk32() { mk() { if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/lib64" + ADDOPTIONS="--libdir=/usr/lib64" + LIBDIR=lib64 + else + LIBDIR=lib fi - CC="gcc ${BUILDOPTIONS}" \ - CXX="g++ ${BUILDOPTIONS}" \ + CC="gcc -isystem /usr/include ${BUILDOPTIONS}" \ + CXX="g++ -isystem /usr/include ${BUILDOPTIONS}" \ + LDFLAGS="-Wl,-rpath-link,/$LIBDIR ${BUILDOPTIONS}" \ ../gmp*/configure --host=$TARGET \ $ADDOPTIONS \ - --prefix=/ + --prefix=/usr \ + --enable-cxx \ + --enable-mpbsd CheckError "Configurescript failed !" 1 @@ -107,15 +119,31 @@ mk() { make -j $NUMCPU CheckError "Makeprocess failed !" 1 + MakeCheck check # Make install Optionen eintragen make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 } postmk() { + mv -v $TMPROOT/usr/include/gmp{,-64}.h mkdir -p $TMPROOT/usr/share - mv $TMPROOT/include $TMPROOT/usr - mv $TMPROOT/info $TMPROOT/usr/share/info + mv $TMPROOT/usr/info $TMPROOT/usr/share/info cd ../gmp* rm -r ../build-gmp + cat > /usr/include/gmp.h << "EOF" +/* gmp.h - Stub Header */ +#ifndef __STUB__GMP_H__ +#define __STUB__GMP_H__ +#if defined(__x86_64__) || \ + defined(__sparc64__) || \ + defined(__arch64__) || \ + defined(__s390x__) +# include "gmp-64.h" +#else +# include "gmp-32.h" +#endif + +#endif /* __STUB__GMP_H__ */ +EOF } diff --git a/BaseBuild/Basesys/iproute2 b/BaseBuild/Basesys/iproute2 index 96263d5..6e87975 100644 --- a/BaseBuild/Basesys/iproute2 +++ b/BaseBuild/Basesys/iproute2 @@ -86,13 +86,18 @@ mk() { LIBDIR=lib fi make -j $NUMCPU CC="gcc ${BUILDOPTIONS}" \ + DESTDIR=/ \ LIBDIR=/usr/$LIBDIR \ VARLIB=/var/$LIBDIR \ - SBINDIR=/sbin + SBINDIR=/sbin \ + DOCDIR=/usr/share/doc/iproute2 \ + MANDIR=/usr/share/man make -j $NUMCPU DESTDIR=$TMPROOT \ LIBDIR=/usr/$LIBDIR \ VARLIB=/var/$LIBDIR \ - SBINDIR=/sbin install + SBINDIR=/sbin \ + DOCDIR=/usr/share/doc/iproute2 \ + MANDIR=/usr/share/man install } #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann diff --git a/BaseBuild/Basesys/libtool b/BaseBuild/Basesys/libtool index 67936a2..c9e9aaa 100644 --- a/BaseBuild/Basesys/libtool +++ b/BaseBuild/Basesys/libtool @@ -75,11 +75,13 @@ premk() { } mk32() { + echo "lt_cv_sys_dlsearch_path='/lib /usr/lib /usr/local/lib /opt/lib'" > config.cache CC="gcc ${BUILDOPTIONS32}"\ - ../libtool*/configure --host=$TARGET32 \ - --prefix=/usr + ../libtool*/configure --prefix=/usr \ + --cache-file=config.cache make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install + mv -v $TMPROOT/usr/bin/libtool{,-32} cd ../libtool* rm -r ../build-libtool mkdir ../build-libtool @@ -87,24 +89,21 @@ mk32() { } mk() { + echo "lt_cv_sys_dlsearch_path='/lib64 /usr/lib64 /usr/local/lib64 /opt/lib64'" > config.cache if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" fi CC="gcc ${BUILDOPTIONS}"\ - ../libtool*/configure --host=$TARGET \ - $ADDOPTIONS \ - --prefix=/usr + ../libtool*/configure $ADDOPTIONS \ + --prefix=/usr \ + --cache-file=config.cache make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install + mv $TMPROOT/usr/bin/libtool{,-64} + ln -s multiarch_wrapper /usr/bin/libtool } postmk() { - cd $TMPROOT - sed -e "s/$TARGET-//g" usr/bin/libtool >/tmp/libtool$$ - mv /tmp/libtool$$ usr/bin/libtool - rm /tmp/libtool$$ - chmod 755 usr/bin/libtool - cd - cd ../libtool* rm -r ../build-libtool } diff --git a/BaseBuild/Basesys/m4 b/BaseBuild/Basesys/m4 index 33e0e4c..6a2e2b9 100644 --- a/BaseBuild/Basesys/m4 +++ b/BaseBuild/Basesys/m4 @@ -75,8 +75,7 @@ premk() { mk() { CC="gcc ${BUILDOPTIONS}" \ - ./configure --host=$TARGET \ - --prefix=/usr + ./configure --prefix=/usr make -j $NUMCPU make -j $NUMCPU prefix=$TMPROOT/usr exec_prefix=$TMPROOT/usr install } diff --git a/BaseBuild/Basesys/mpfr b/BaseBuild/Basesys/mpfr new file mode 100644 index 0000000..e006151 --- /dev/null +++ b/BaseBuild/Basesys/mpfr @@ -0,0 +1,129 @@ +#!/bin/bash +#Framework, welches ein komplettes Linux System aus den Sourcen erstellt +#dieses Framework wird im CVS Repository +#:pserver:cvs.tramp-bbs.de:/opt/cvs zur Verfügung gestellt +# +#Lage dieser Datei im Archiv: $HeadURL: svn://www.compuextreme.de/Viitor/V962/ViitorMake/BaseBuild/Basesys/gmp $ +# +#(c) 2003 Harald Kueller, Germany +#This program is free software; you can redistribute it and/or +#modify ist under the terms of the GNU General Public License +#as published by the Free Software Foundation; either version +#2 of the License, or (at your option) any later version. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +#See the GNU General Public License for more details. +# +#You should have received a copy of the GNU General Public License +#along with this program; if not write to the Free Software Foundation, +#Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +#Dies ist ein Module zur Verwendung mit genpkg. Die Erzeugung eines +#Viitor Linux Packetes wird über die Funktionen premk, mk und postmk +#gesteuert. premk() dient zur Vorbereitung des Sourcecodes. Hier können +#diverse Änderungen am sourcecode (mit awk/sed usw.) vorgenommen werden +#mk() umfasst die source Konfiguration und das Übersetzten des source +#codes. Auch die Installation muß von mk erledigt werden. Hier gild dass +#die Installation immer nach $TMPROOT erfolgen soll (meisst kann das mit +#"make DESTDIR=$TMPROOT install" angestossen werden). postmk kann +#vor der packeterstellung noch einiges am installationtree ändern. postmk +#läuft nachdem die Packetabhängigkeiten erstellt wurden. +#Das Verhalten von genpkg kann über die Variable MKPKG gesteuert werden. +#Hier müssen FLAGS zur Steuerung gesetzt werden. Folgende Flags werden +#erkannt: +# +# 1 : Package Erzeugung erzwingen. Packet wird, auch wenn es schon +# vorhanden ist, ohne weitere rückfragen neu Erzeugt. +# 2 : Package Installation erzwingen. Installpkg wird mit -f aufgerufen. +# Das bewirkt, das installpkg keine rückfragen bei der installation +# Stellt, und das packet in jedemfall (neu) installiert. +# 4 : Sourcepacket nicht nach MAKEDIR entpacken. Ist dieses Flag gesetzt +# muss sich das Module selber um das Entpacken der sourcedateien kümmern. +# vor allem wichtig bei Packeten, für die es keine source.tgz gibt +# (z.B. aus dem CVS generierte Packete). +# 8 : Erstellung des Packetes aus $TMPROOT wird unterdrückt. Dies ist bei +# manchen Sonderfällen möglich - wenn sich z.B. der Packetnamen nicht +# aus dem Namen des sourcearchives ableiten lässt. Packet sollte in +# so einem Fall in der postmk() Funktion erstellt werden. +# 16 : Packet wird nicht installiert. Bei Packeten wie tar oder bash kann +# die installation mittelst installpkg probleme machen. +# 32 : Dependics File so erzeugen, das die Abhängigkeiten bei der installation +# erfüllt sein müssen. installpkg bricht in so einem fall bei fehlenden +# packeten die installation ab, und gibt nicht "nur" warnmeldungen aus. +# Wichtig bei packeten mit postinstallroutine, die software aus dem +# frisch installierten Packet verwendet (wie z.B. postgresql) +# 64 : sourcetree aufräumen nach packeterstellung unterbinden. +# +#Module zur Erstellung des Packetes: mpfr +#Quelle der Source Archive: http://www.mpfr.og +#Kurzbeschreibung: +#Library zur hochperformanten floating Point Berechnung mit korrekter Rundung +# +#Letzte Änderung von: $Author: kueller $ +#Datum der letzten Änderung: $Date: 2008-05-02 13:13:24 +0000 (Fr, 02 Mai 2008) $ +#Version der Datei: $Revision: 4220 $ +# + +#Pfad zum Basis-Sourcetree : +SRCPATH=Base/lib + +(( MKPKG = $MKPKG | 8 )) +(( MKPKG = $MKPKG | 16 )) + +#Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist +#SRCDIR= + + +premk() { + mkdir ../build-mpfr + cd ../build-mpfr +} + +mk32() { + CC="gcc -isystem /usr/include ${BUILDOPTIONS32}" \ + LDFLAGS="-Wl,-rpath-link,/lib ${BUILDOPTIONS32}" \ + ../mpfr*/configure --host=$TARGET32 \ + --prefix=/usr \ + --enable-shared + make -j $NUMCPU + MakeCheck check + make -j $NUMCPU install + cd ../mpfr* + rm -r ../build-mpfr + mkdir ../build-mpfr + cd ../build-mpfr +} + +mk() { + if [ $MK64BIT == "true" ]; then + LIBDIR=lib64 + else + LIBDIR=lib + fi + 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 \ + + CheckError "Configurescript failed !" 1 + + # Make-Optionen eintragen + make -j $NUMCPU + CheckError "Makeprocess failed !" 1 + + MakeCheck check + # Make install Optionen eintragen + make -j $NUMCPU install + CheckError "Make install process failed !" 1 +} + +postmk() { + cd ../mpfr* + rm -r ../build-mpfr +} diff --git a/BaseBuild/Basesys/ncurses b/BaseBuild/Basesys/ncurses index d6d99af..18d7b5c 100644 --- a/BaseBuild/Basesys/ncurses +++ b/BaseBuild/Basesys/ncurses @@ -69,12 +69,12 @@ #Version der Datei: $Revision$ # -#(( MKPKG = $MKPKG | 128 )) +(( MKPKG = $MKPKG | 128 )) SRCPATH=Base/lib premk() { - #SrcPatch $MAKEDIR/ncurses* $LFSSOURCE/$SRCPATH/ncurses-*-branch_update-2.patch* + SrcPatch $MAKEDIR/ncurses* $LFSSOURCE/$SRCPATH/ncurses-*-branch_update-*.patch* mkdir $TMPROOT/usr $TMPROOT/usr/lib $TMPROOT/usr/share $TMPROOT/lib mkdir ../build-ncurses cd ../build-ncurses @@ -86,7 +86,8 @@ mk32() { ../ncurses*/configure --prefix=/usr \ --libdir=/lib \ --with-shared \ - --without-debug + --without-debug \ + --enable-widec make make install make DESTDIR=$TMPROOT install @@ -104,60 +105,99 @@ mk() { else ADDOPTIONS="--libdir=/lib" fi - CC="gcc ${BUILDOPTIONS} -fPIC" \ - CXX="g++ ${BUILDOPTIONS} -fPIC" \ + CC="gcc ${BUILDOPTIONS}" \ + CXX="g++ ${BUILDOPTIONS}" \ ../ncurses*/configure --prefix=/usr \ $ADDOPTIONS \ --with-shared \ - --without-debug + --without-debug \ + --enable-widec make make install make DESTDIR=$TMPROOT install + mv -v /usr/bin/ncursesw5-config{,-64} + ln -svf multiarch_wrapper /usr/bin/ncursesw5-config + mv -v $TMPROOT/usr/bin/ncursesw5-config{,-64} + ln -svf multiarch_wrapper $TMPROOT/usr/bin/ncursesw5-config } postmk() { - mv -v $TMPROOT/lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a \ - $TMPROOT/usr/lib - mv -v /lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a \ - /usr/lib - rm -v $TMPROOT/lib/lib{ncurses,menu,panel,form,curses}.so - rm -v /lib/lib{ncurses,menu,panel,form,curses}.so - mkdir -p $TMPROOT/usr/lib - ln -svf ../../lib/libncurses.so.5 /usr/lib/libcurses.so - ln -svf ../../lib/libncurses.so.5 /usr/lib/libncurses.so - ln -svf ../../lib/libmenu.so.5 /usr/lib/libmenu.so - ln -svf ../../lib/libpanel.so.5 /usr/lib/libpanel.so - ln -svf ../../lib/libform.so.5 /usr/lib/libform.so - ln -svf ../../lib/libncurses.so.5 $TMPROOT/usr/lib/libcurses.so - ln -svf ../../lib/libncurses.so.5 $TMPROOT/usr/lib/libncurses.so - ln -svf ../../lib/libmenu.so.5 $TMPROOT/usr/lib/libmenu.so - ln -svf ../../lib/libpanel.so.5 $TMPROOT/usr/lib/libpanel.so - ln -svf ../../lib/libform.so.5 $TMPROOT/usr/lib/libform.so - chmod -v 755 $TMPROOT/lib/lib{panel,menu,panel,form,ncurses}.so.5.5 - if [ "$MK64BIT" == "true" ]; then - mv $TMPROOT/usr/bin/ncurses5-config{,-64} - mv /usr/bin/ncurses5-config{,-64} - ln -sv /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/ncurses5-config - ln -sv /usr/bin/multiarch_wrapper /usr/bin/ncurses5-config - mkdir -p $TMPROOT/usr/lib64 - mv -v $TMPROOT/lib64/lib{panel,menu,form,ncurses,ncurses++,curses}.a \ - $TMPROOT/usr/lib64 - mv -v /lib64/lib{panel,menu,form,ncurses,ncurses++,curses}.a \ - /usr/lib64 - rm -v $TMPROOT/lib64/lib{ncurses,menu,panel,form,curses}.so - rm -v /lib64/lib{ncurses,menu,panel,form,curses}.so - ln -svf ../../lib64/libncurses.so.5 /usr/lib64/libcurses.so - ln -svf ../../lib64/libncurses.so.5 /usr/lib64/libncurses.so - ln -svf ../../lib64/libmenu.so.5 /usr/lib64/libmenu.so - ln -svf ../../lib64/libpanel.so.5 /usr/lib64/libpanel.so - ln -svf ../../lib64/libform.so.5 /usr/lib64/libform.so - ln -svf ../../lib64/libncurses.so.5 $TMPROOT/usr/lib64/libcurses.so - ln -svf ../../lib64/libncurses.so.5 $TMPROOT/usr/lib64/libncurses.so - ln -svf ../../lib64/libmenu.so.5 $TMPROOT/usr/lib64/libmenu.so - ln -svf ../../lib64/libpanel.so.5 $TMPROOT/usr/lib64/libpanel.so - ln -svf ../../lib64/libform.so.5 $TMPROOT/usr/lib64/libform.so - chmod -v 755 $TMPROOT/lib64/lib{panel,menu,panel,form,ncurses}.so.5.5 + #korrekt the files in build System for 32 Bit + mv -v /lib/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a /usr/lib + rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so + ln -svf ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so + ln -svf ../../lib/libmenuw.so.5 /usr/lib/libmenuw.so + ln -svf ../../lib/libpanelw.so.5 /usr/lib/libpanelw.so + ln -svf ../../lib/libformw.so.5 /usr/lib/libformw.so + for lib in curses ncurses form panel menu ; do + echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so + ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a + done + ln -sfv libcurses.so /usr/lib/libcursesw.so + ln -sfv libncurses.so /usr/lib/libcurses.so + ln -sfv libncursesw.a /usr/lib/libcursesw.a + ln -sfv libncurses.a /usr/lib/libcurses.a + ln -sfv libncurses++w.a /usr/lib/libncurses++.a + ln -sfv ncursesw5-config-32 /usr/bin/ncurses5-config-32 + ln -sfv ../../usr/share/terminfo /usr/lib/terminfo + #korrekt the files in $TMPROOT for 32 bit + mv -v $TMPROOT/lib/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a $TMPROOT/usr/lib + rm -v $TMPROOT/lib/lib{ncursesw,menuw,panelw,formw}.so + ln -svf ../../lib/libncursesw.so.5 $TMPROOT/usr/lib/libncursesw.so + ln -svf ../../lib/libmenuw.so.5 $TMPROOT/usr/lib/libmenuw.so + ln -svf ../../lib/libpanelw.so.5 $TMPROOT/usr/lib/libpanelw.so + ln -svf ../../lib/libformw.so.5 $TMPROOT/usr/lib/libformw.so + for lib in curses ncurses form panel menu ; do + echo "INPUT(-l${lib}w)" > $TMPROOT/usr/lib/lib${lib}.so + ln -sfv lib${lib}w.a $TMPROOT/usr/lib/lib${lib}.a + done + ln -sfv libcurses.so $TMPROOT/usr/lib/libcursesw.so + ln -sfv libncurses.so $TMPROOT/usr/lib/libcurses.so + ln -sfv libncursesw.a $TMPROOT/usr/lib/libcursesw.a + ln -sfv libncurses.a $TMPROOT/usr/lib/libcurses.a + ln -sfv libncurses++w.a $TMPROOT/usr/lib/libncurses++.a + ln -sfv ncursesw5-config-32 $TMPROOT/usr/bin/ncurses5-config-32 + ln -sfv ../../usr/share/terminfo $TMPROOT/usr/lib/terminfo + if [ $MK64BIT == "true" ]; then + #Korrekt the files in Build System for 64 Bit + mv -v /lib64/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a /usr/lib64 + rm -v /lib64/lib{ncursesw,menuw,panelw,formw,cursesw}.so + ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libcursesw.so + ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libncursesw.so + ln -svf ../../lib64/libmenuw.so.5 /usr/lib64/libmenuw.so + ln -svf ../../lib64/libpanelw.so.5 /usr/lib64/libpanelw.so + ln -svf ../../lib64/libformw.so.5 /usr/lib64/libformw.so + for lib in curses ncurses form panel menu ; do + echo "INPUT(-l${lib}w)" > /usr/lib64/lib${lib}.so + ln -sfv lib${lib}w.a /usr/lib64/lib${lib}.a + done + ln -sfv libcurses.so /usr/lib64/libcursesw.so + ln -sfv libncurses.so /usr/lib64/libcurses.so + ln -sfv libncursesw.a /usr/lib64/libcursesw.a + ln -sfv libncurses.a /usr/lib64/libcurses.a + ln -sfv libncurses++w.a /usr/lib64/libncurses++.a + ln -sfv ncursesw5-config-64 /usr/bin/ncurses5-config-64 + ln -sfv ncursesw5-config /usr/bin/ncurses5-config + ln -sfv ../../usr/share/terminfo /usr/lib64/terminfo + #Korrekt the files in $TMPROOT for 64 Bit + mv -v $TMPROOT/lib64/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a $TMPROOT/usr/lib64 + rm -v $TMPROOT/lib64/lib{ncursesw,menuw,panelw,formw,cursesw}.so + ln -svf ../../lib64/libncursesw.so.5 $TMPROOT/usr/lib64/libcursesw.so + ln -svf ../../lib64/libncursesw.so.5 $TMPROOT/usr/lib64/libncursesw.so + ln -svf ../../lib64/libmenuw.so.5 $TMPROOT/usr/lib64/libmenuw.so + ln -svf ../../lib64/libpanelw.so.5 $TMPROOT/usr/lib64/libpanelw.so + ln -svf ../../lib64/libformw.so.5 $TMPROOT/usr/lib64/libformw.so + for lib in curses ncurses form panel menu ; do + echo "INPUT(-l${lib}w)" > $TMPROOT/usr/lib64/lib${lib}.so + ln -sfv lib${lib}w.a $TMPROOT/usr/lib64/lib${lib}.a + done + ln -sfv libcurses.so $TMPROOT/usr/lib64/libcursesw.so + ln -sfv libncurses.so $TMPROOT/usr/lib64/libcurses.so + ln -sfv libncursesw.a $TMPROOT/usr/lib64/libcursesw.a + ln -sfv libncurses.a $TMPROOT/usr/lib64/libcurses.a + ln -sfv libncurses++w.a $TMPROOT/usr/lib64/libncurses++.a + ln -sfv ncursesw5-config-64 $TMPROOT/usr/bin/ncurses5-config-64 + ln -sfv ncursesw5-config $TMPROOT/usr/bin/ncurses5-config + ln -sfv ../../usr/share/terminfo $TMPROOT/usr/lib64/terminfo fi - cd ../ncurses* - rm -r ../build-ncurses } diff --git a/BaseBuild/Basesys/procps b/BaseBuild/Basesys/procps index 4b9c14b..cdf81ea 100644 --- a/BaseBuild/Basesys/procps +++ b/BaseBuild/Basesys/procps @@ -77,7 +77,6 @@ mk32() { make -j $NUMCPU CC="gcc ${BUILDOPTIONS32}" m64="" make -j $NUMCPU DESTDIR=$TMPROOT install lib64=lib make clean - echo "cleaned up" } mk() { diff --git a/BaseBuild/Basesys/sed b/BaseBuild/Basesys/sed index b7439f5..86af222 100644 --- a/BaseBuild/Basesys/sed +++ b/BaseBuild/Basesys/sed @@ -77,7 +77,8 @@ mk() { CC="gcc ${BUILDOPTIONS}" \ ./configure --host=$TARGET \ --prefix=/usr \ - --bindir=/bin + --bindir=/bin \ + --enable-html make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/BaseBuild/Basesys/shadow b/BaseBuild/Basesys/shadow index cf3c4a8..bfc61f2 100644 --- a/BaseBuild/Basesys/shadow +++ b/BaseBuild/Basesys/shadow @@ -77,7 +77,7 @@ premk() { mk32() { CC="gcc ${BUILDOPTIONS32}" \ - CXX="gcc ${BUILDOPTIONS32}" \ + CXX="g++ ${BUILDOPTIONS32}" \ ../shadow*/configure --prefix=/usr \ --libdir=/lib \ --sysconfdir=/etc \ diff --git a/BaseBuild/Basesys/unzip b/BaseBuild/Basesys/unzip index acdf8f4..8e0a6ff 100644 --- a/BaseBuild/Basesys/unzip +++ b/BaseBuild/Basesys/unzip @@ -85,7 +85,7 @@ mk() { make -j $NUMCPU \ -f unix/Makefile \ CC="gcc $BUILDOPTIONS" \ - CXX="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ generic cp unix/Makefile /tmp CheckError "Makeprocess failed !" 1 diff --git a/BaseBuild/Basesys/xfsprogs b/BaseBuild/Basesys/xfsprogs index f3bc83d..a17aa72 100644 --- a/BaseBuild/Basesys/xfsprogs +++ b/BaseBuild/Basesys/xfsprogs @@ -78,7 +78,7 @@ premk() { mk32() { CC="gcc ${BUILDOPTIONS32}" \ - CXX="gcc ${BUILDOPTIONS32}" \ + CXX="g++ ${BUILDOPTIONS32}" \ ./configure --host=$TARGET \ --prefix=/ \ --mandir=/usr/share/man \ @@ -124,7 +124,7 @@ mk() { PKGLIBDIR=lib fi CC="gcc ${BUILDOPTIONS}" \ - CXX="gcc ${BUILDOPTIONS}" \ + CXX="g++ ${BUILDOPTIONS}" \ ./configure --host=$TARGET \ --prefix=/ \ $ADDOPTIONS \ diff --git a/BaseBuild/Basesys/zlib b/BaseBuild/Basesys/zlib index 624f2ab..d1b2bc7 100644 --- a/BaseBuild/Basesys/zlib +++ b/BaseBuild/Basesys/zlib @@ -88,12 +88,13 @@ if [ -d /var/install/zlib* ]; then fi premk() { - echo "Nothing to do for zlib" + echo "Nothing to do for premk()" } mk32() { - CC="gcc ${BUILDOPTIONS32}" \ - CXX="gcc ${BUILDOPTIONS32}" \ + CC="gcc -isystem /usr/include ${BUILDOPTIONS32}" \ + CXX="g++ -isystem /usr/include ${BUILDOPTIONS32}" \ + LDFLAGS="Wl,-rpath-link,/lib ${BUILDOPTIONS32}" \ ./configure --prefix=/usr \ --shared make -j $NUMCPU @@ -102,6 +103,10 @@ mk32() { rm -r zlib-* UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/zlib-*.tar* cd $MAKEDIR/zlib-* + mkdir -p $TMPROOT/lib + mv -v $TMPROOT/usr/lib/libz.so.* $TMPROOT/lib + ln -s ../../lib/libz.so.1 $TMPROOT/usr/lib/libz.so + chmod -v 644 /usr/lib/libz.a } #Hier wird der Make Prozess der Sourcen definiert @@ -109,36 +114,29 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" ADDMAKE="libdir=$TMPROOT/usr/lib64" + LIBDIR=lib64 + else + LIBDIR=lib fi - CC="gcc ${BUILDOPTIONS} -fPIC" \ - CXX="g++ ${BUILDOPTIONS} -fPIC" \ + CC="gcc -isystem /usr/include ${BUILDOPTIONS} -fPIC" \ + CXX="g++ -isystem /usr/include ${BUILDOPTIONS} -fPIC" \ ./configure --prefix=/usr \ $ADDOPTIONS \ --shared make -j $NUMCPU && - make -j $NUMCPU libz.a && + #make -j $NUMCPU libz.a && make -j $NUMCPU prefix=$TMPROOT/usr $ADDMAKE install - if [ "$MK64BIT" == "true" ]; then - make -j $NUMCPU libz.a - fi + #if [ "$MK64BIT" == "true" ]; then + #make -j $NUMCPU libz.a + #fi + mkdir -p $TMPROOT/$LIBDIR + mv -v $TMPROOT/usr/$LIBDIR/libz.so.* $TMPROOT/$LIBDIR + ln -s ../../$LIBDIR/libz.so.1 $TMPROOT/usr/$LIBDIR/libz.so + chmod -v 644 /usr/$LIBDIR/libz.a } #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann #in $TMPROOT noch einiges korrigieren postmk() { - mkdir -p $TMPROOT/lib - mv $TMPROOT/usr/lib/libz.so.* $TMPROOT/lib - ln -svf ../../lib/libz.so.1 $TMPROOT/usr/lib/libz.so - chmod -v 644 /usr/lib/libz.a - mv /usr/lib/libz.a $TMPROOT/usr/lib - if [ "$MK64BIT" == "true" ]; then - mkdir -p $TMPROOT/lib64 - mkdir -p $TMPROOT/usr/lib64 - mv -v $TMPROOT/usr/lib64/libz.so* $TMPROOT/lib64 - ln -svf ../../lib64/libz.so.1 $TMPROOT/usr/lib64/libz.so - if [ -f libz.a ]; then - chmod -v 644 ./libz.a - mv ./libz.a $TMPROOT/usr/lib64 - fi - fi + echo "Nothing to do for postmk()" }