From 8616e702db84ceded3352166525f18a66758a6e6 Mon Sep 17 00:00:00 2001 From: kueller Date: Wed, 3 Jun 2009 08:26:26 +0000 Subject: [PATCH] Und wieder einige Packages Ready.. git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4780 504e572c-2e33-0410-9681-be2bf7408885 --- SysBuild/BuildCluster/Tools.dmk | 30 ++++++----- SysBuild/{tools => network}/fetchmail | 17 +++++- SysBuild/{tools => network}/linc | 17 +++--- SysBuild/{tools => network}/nss_ldap | 15 +++++- SysBuild/{tools => network}/openobex | 7 ++- SysBuild/{tools => network}/qpopper | 5 +- SysBuild/tools/netpbm | 75 ++++++++++++++------------- SysBuild/tools/sane-backends | 6 ++- SysBuild/{xsys => tools}/tiff | 4 +- 9 files changed, 111 insertions(+), 65 deletions(-) rename SysBuild/{tools => network}/fetchmail (92%) rename SysBuild/{tools => network}/linc (92%) rename SysBuild/{tools => network}/nss_ldap (93%) rename SysBuild/{tools => network}/openobex (97%) rename SysBuild/{tools => network}/qpopper (97%) rename SysBuild/{xsys => tools}/tiff (98%) diff --git a/SysBuild/BuildCluster/Tools.dmk b/SysBuild/BuildCluster/Tools.dmk index 14929f2..2b38e6c 100644 --- a/SysBuild/BuildCluster/Tools.dmk +++ b/SysBuild/BuildCluster/Tools.dmk @@ -25,22 +25,21 @@ 0 network/quagga 0 network/aria2 0 network/ircii - -0 tools/rpm -0 tools/clamcour -0 tools/rsync -0 tools/openvpn -0 tools/pam_ldap +0 network/rsync +0 network/openvpn +0 network/pam_ldap 0 tools/nrpe -0 tools/sendmail -0 tools/mutt -0 tools/htdig -0 tools/nss_ldap -0 tools/fetmail -0 tools/qpopper -0 tools/linc -0 tools/openobex +0 network/sendmail +0 network/mutt +0 network/htdig +0 network/nss_ldap +0 network/fetchmail +0 network/qpopper +0 network/linc +0 network/openobex 0 tools/sane-backends +0 tools/tiff + 0 tools/netpbm 0 tools/gstreamer 0 tools/atk @@ -75,6 +74,7 @@ 0 tools/proftp 0 tools/jabberd 0 tools/courier +0 tools/clamcour 0 tools/obexftp 0 tools/openjade #pidgin plugin - wird wohl pidgin benötigen... @@ -82,3 +82,5 @@ #Benötigt PostgreSQL #0 tools/dspam #0 tools/nagios-plugins +#Braucht nss Librarys +#0 tools/rpm diff --git a/SysBuild/tools/fetchmail b/SysBuild/network/fetchmail similarity index 92% rename from SysBuild/tools/fetchmail rename to SysBuild/network/fetchmail index 127c162..e68af92 100644 --- a/SysBuild/tools/fetchmail +++ b/SysBuild/network/fetchmail @@ -69,7 +69,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Net +SRCPATH=Network/Clients #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -79,9 +79,24 @@ premk() { echo "Nothing to do for premk()" } +mk32() { + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ + ./configure --host=$TARGET \ + --prefix=/usr \ + --with-catgets \ + --enable-fallback=no \ + --with-ssl && + make -j $NUMCPU && + make -j $NUMCPU DESTDIR=$TMPROOT install + make distclean +} + mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --prefix=/usr \ --with-catgets \ diff --git a/SysBuild/tools/linc b/SysBuild/network/linc similarity index 92% rename from SysBuild/tools/linc rename to SysBuild/network/linc index 463157f..de6daee 100644 --- a/SysBuild/tools/linc +++ b/SysBuild/network/linc @@ -68,7 +68,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/lib +SRCPATH=Network/Lib #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -81,28 +81,33 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ - --prefix=/usr/X11R7 && + --prefix=/usr && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install make clean + mv $TMPROOT/usr/bin/linc-config{,-32} } mk() { if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=/usr/X11R7/lib64" + ADDOPTIONS="--libdir=/usr/lib64" export LDFLAGS="-L/usr/lib64 -L/usr/X11R7/lib64" fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ $ADDOPTIONS \ - --prefix=/usr/X11R7 && + --prefix=/usr make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install } postmk() { - echo "Nothing to do for postmk()" - CheckError "postmk() failed !" 1 + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/bin/linc-config{,-64} + ln -s multiarch_wrapper $TMPROOT/usr/bin/linc-config + fi } diff --git a/SysBuild/tools/nss_ldap b/SysBuild/network/nss_ldap similarity index 93% rename from SysBuild/tools/nss_ldap rename to SysBuild/network/nss_ldap index 8a0d122..0ae7237 100644 --- a/SysBuild/tools/nss_ldap +++ b/SysBuild/network/nss_ldap @@ -70,16 +70,27 @@ # # -SRCPATH=Tools/Net +SRCPATH=Network/Clients premk() { echo "Nothing to do for premk()" } +mk32() { + CC="gcc $BUILDOPTIONS32" \ + CXX="g++ $BUILDOPTIONS32" \ + ./configure --target=$TARGET32 + + make -j $NUMCPU + make -j $NUMCPU DESTDIR=$TMPROOT install + make distclean +} + mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - ./configure --target=$TARGET + ./configure --target=$TARGET \ + --libdir=/$LIBDIR make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install diff --git a/SysBuild/tools/openobex b/SysBuild/network/openobex similarity index 97% rename from SysBuild/tools/openobex rename to SysBuild/network/openobex index eb2a708..309087d 100644 --- a/SysBuild/tools/openobex +++ b/SysBuild/network/openobex @@ -60,7 +60,8 @@ #Module zur Erstellung des Packetes: #Quelle der Source Archive: http://openobex.triq.net/ -#Kurzbeschreibung: filetransfertools e.g. for mobile phones +#Kurzbeschreibung: +#filetransfertools e.g. for mobile phones # # #Letzte Änderung von: $Author$ @@ -69,7 +70,7 @@ # # -SRCPATH=Tools/lib +SRCPATH=Network/Lib premk() { echo "Nothing to do for premk()" @@ -78,6 +79,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --enable-apps \ --prefix=/usr @@ -92,6 +94,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --enable-apps \ $ADDOPTIONS \ diff --git a/SysBuild/tools/qpopper b/SysBuild/network/qpopper similarity index 97% rename from SysBuild/tools/qpopper rename to SysBuild/network/qpopper index 7a81e63..231d6ef 100644 --- a/SysBuild/tools/qpopper +++ b/SysBuild/network/qpopper @@ -68,7 +68,7 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Net +SRCPATH=Network/Servers #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= @@ -79,6 +79,7 @@ premk() { cd $TMPROOT/usr ln -sf share/man man cd - + sed -i -e "s/-md/-m/" Makefile.in } mk() { @@ -89,7 +90,7 @@ mk() { --with-pam \ --enable-tmp-drop-dir=/var/tmp && make -j $NUMCPU && - make -j $NUMCPU prefix=$TMPROOT/usr install && + make -k -j $NUMCPU prefix=$TMPROOT/usr install && CheckError "Make install process failed !" 1 } diff --git a/SysBuild/tools/netpbm b/SysBuild/tools/netpbm index f8ece84..c6158db 100644 --- a/SysBuild/tools/netpbm +++ b/SysBuild/tools/netpbm @@ -69,42 +69,54 @@ # # -SRCPATH=Tools/Grafik +SRCPATH=Tools/Utilities +SRCDIR=stable premk() { - echo "Nothing to do for premk()" + chmod 755 configure + chmod 755 buildtools/* } mk32() { - echo -e "\ngnu\n\n\n\n\n\n\n\n\n\n\n\n\n\n" |./configure - make CC="/opt/gcc-3/bin/gcc -m32" - mkdir -p $TMPROOT + yes ""|\ + CC="gcc $BUILDOPTIONS32 -fPIC" \ + CXX="g++ $BUILDOPTIONS32 -fPIC" \ + USE_ARCH=$UARCH \ + LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \ + ./configure + make -j 8 CC="gcc $BUILDOPTIONS32 -fPIC" \ + CXX="gcc $BUILDOPTIONS32 -fPIC" \ + USE_ARCH=$UARCH \ + LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" + make -j 8 CC="gcc $BUILDOPTIONS32 -fPIC" \ + CXX="gcc $BUILDOPTIONS32 -fPIC" \ + USE_ARCH=$UARCH \ + LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" make package pkgdir=$TMPROOT/usr make distclean - if [ -h $TMPROOT/usr/lib/libnetpbm.so ]; then - rm $TMPROOT/usr/lib/libnetpbm.so - fi - ln -sf libnetpbm.so.10 $TMPROOT/usr/lib/libnetpbm.so + mv $TMPROOT/usr/link/libnetpbm.a $TMPROOT/usr/lib + rm -r $TMPROOT/usr/link + mv $TMPROOT/usr $TMPROOT/usr32 } mk() { - if [ "$MK64BIT" == "true" ]; then - COPTS="-m64" - mv $TMPROOT/usr $TMPROOT/usr32 - sed -e "s%/lib/libvga%/lib64/libvga%" buildtools/configure.pl >/tmp/configure.pl - mv /tmp/configure.pl buildtools/configure.pl - chmod 755 buildtools/configure.pl - fi - if [ ! -d "$TMPROOT"]; then - mkdir -p $TMPROOT - fi - echo -e "\ngnu\n\n\n\n\n\n\n\n\n\n\n\n\n\n" |./configure - make CC="/opt/gcc-3/bin/gcc -fPIC $COPTS" + yes ""|\ + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ + LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ + ./configure + make -j 8 CC="gcc $BUILDOPTIONS -fPIC" \ + CXX="gcc $BUILDOPTIONS -fPIC" \ + USE_ARCH=$UARCH \ + LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" + make -j 8 CC="gcc $BUILDOPTIONS -fPIC" \ + CXX="gcc $BUILDOPTIONS -fPIC" \ + USE_ARCH=$UARCH \ + LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" make package pkgdir=$TMPROOT/usr - if [ -h $TMPROOT/usr/lib/libnetpbm.so ]; then - rm $TMPROOT/usr/lib/libnetpbm.so - fi - ln -sf libnetpbm.so.10 $TMPROOT/usr/lib/libnetpbm.so + mv $TMPROOT/usr/link/libnetpbm.a $TMPROOT/usr/lib + rm -r $TMPROOT/usr/link } postmk() { @@ -116,15 +128,8 @@ postmk() { rm -r $TMPROOT/usr mv $TMPROOT/usr32 $TMPROOT/usr fi - mkdir -p $TMPROOT/usr/$LIBDIR $TMPROOT/usr/include $TMPROOT/usr/share/doc/netpbm - if [ -h $TMPROOT/usr/link/libnetpbm.so ]; then - rm $TMPROOT/usr/link/libnetpbm.so - fi - mv $TMPROOT/usr/link/* $TMPROOT/usr/$LIBDIR - rmdir $TMPROOT/usr/link - mkdir -p $TMPROOT/usr/share/netpbm - mv $TMPROOT/usr/misc/* $TMPROOT/usr/share/netpbm - rmdir $TMPROOT/usr/misc + mkdir -p $TMPROOT/usr/share/doc/netpbm $TMPROOT/usr/share/netpbm + mv $TMPROOT/usr/misc $TMPROOT/usr/share/netpbm + mv $TMPROOT/usr/{config_template,pkginfo,README,VERSION} $TMPROOT/usr/share/doc/netpbm cp doc/* $TMPROOT/usr/share/doc/netpbm - mv $TMPROOT/usr/README $TMPROOT/usr/VERSION $TMPROOT/usr/pkginfo $TMPROOT/usr/share/doc/netpbm } diff --git a/SysBuild/tools/sane-backends b/SysBuild/tools/sane-backends index d135487..88d7b40 100644 --- a/SysBuild/tools/sane-backends +++ b/SysBuild/tools/sane-backends @@ -71,19 +71,20 @@ # #Pfad zum Basis-Sourcetree : -SRCPATH=Tools/Grafik +SRCPATH=Tools/Utilities #Wenn das usgepackte Verzeichnis vom Paketnamen unterschiedlich ist #SRCDIR= premk() { - mkdir $TMPROOT/etc/sysconfig -p + mkdir -p $TMPROOT/etc/sysconfig } mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --prefix=/usr \ --sysconfdir=/etc/sysconfig && @@ -100,6 +101,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --prefix=/usr \ $ADDOPTIONS \ diff --git a/SysBuild/xsys/tiff b/SysBuild/tools/tiff similarity index 98% rename from SysBuild/xsys/tiff rename to SysBuild/tools/tiff index 6a8ab10..59b05bb 100644 --- a/SysBuild/xsys/tiff +++ b/SysBuild/tools/tiff @@ -67,7 +67,7 @@ # # -SRCPATH=X11/lib +SRCPATH=Tools/Lib #Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen #ausgeführt (sprich unpack src; cd src; premk) @@ -80,6 +80,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/usr make -j $NUMCPU @@ -95,6 +96,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ $ADDOPTIONS \ --prefix=/usr