From 5ad2d1279df3285860fee8ea824266d6f3ff0d96 Mon Sep 17 00:00:00 2001 From: kueller Date: Sat, 16 May 2009 10:46:27 +0000 Subject: [PATCH] Diverse Updates und Anpassungan an V962 git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4692 504e572c-2e33-0410-9681-be2bf7408885 --- SysBuild/tools/aircrack-ng | 3 +-- SysBuild/tools/dbus | 1 + SysBuild/tools/ez-ipupdate | 2 ++ SysBuild/tools/gdbm | 2 ++ SysBuild/tools/iptables | 35 ++++++++++++++++++----------------- SysBuild/tools/pks | 27 ++++++++++++++++++++++++--- SysBuild/tools/popt | 2 ++ SysBuild/tools/ppp | 28 +++++++++++++++++++++++++++- SysBuild/tools/rinetd | 2 +- SysBuild/xsys/PDL | 21 +++++++++++++++++++-- SysBuild/xsys/dbus-glib | 6 +++--- 11 files changed, 100 insertions(+), 29 deletions(-) diff --git a/SysBuild/tools/aircrack-ng b/SysBuild/tools/aircrack-ng index 601f65d..a900855 100644 --- a/SysBuild/tools/aircrack-ng +++ b/SysBuild/tools/aircrack-ng @@ -74,8 +74,7 @@ SRCPATH=Tools/Net premk() { - mv Makefile Makefile.orig - sed -e "s/\/usr\/local/$\(DESTDIR\)\/usr/g" < Makefile.orig >Makefile + sed -i -e "s%/usr/local%/usr%g" common.mak } mk() { diff --git a/SysBuild/tools/dbus b/SysBuild/tools/dbus index 0bdcf59..cb008f7 100644 --- a/SysBuild/tools/dbus +++ b/SysBuild/tools/dbus @@ -95,6 +95,7 @@ mk32() { rm -r ../Build-dbus && mkdir ../Build-dbus && cd ../Build-dbus + make distclean } mk() { diff --git a/SysBuild/tools/ez-ipupdate b/SysBuild/tools/ez-ipupdate index e72b655..8c24136 100644 --- a/SysBuild/tools/ez-ipupdate +++ b/SysBuild/tools/ez-ipupdate @@ -83,6 +83,8 @@ premk() { mk() { # Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen. # Den \ nicht vergessen ! + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ ./configure --host=$TARGET \ --prefix=/usr diff --git a/SysBuild/tools/gdbm b/SysBuild/tools/gdbm index 14fa0a5..44d0f9e 100644 --- a/SysBuild/tools/gdbm +++ b/SysBuild/tools/gdbm @@ -82,6 +82,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --prefix=/usr \ --with-gnu-ld && @@ -98,6 +99,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --prefix=/usr \ $ADDOPTIONS \ diff --git a/SysBuild/tools/iptables b/SysBuild/tools/iptables index 22a0bab..3fe3f62 100644 --- a/SysBuild/tools/iptables +++ b/SysBuild/tools/iptables @@ -76,32 +76,33 @@ SRCPATH=Tools/Net #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen premk() { - sed -e "s%PREFIX:=/usr/local%PREFIX:=/usr%" Makefile >/tmp/Makefile - if [ "$MK64BIT" == "true" ]; then - sed -e "s%LIBDIR:=\$(PREFIX)/lib%LIBDIR:=\$(PREFIX)/lib64%" \ - /tmp/Makefile >Makefile - else - mv /tmp/Makefile . - fi + echo "Nothing to do for premk" +} + +mk32() { + CC="gcc $BUILDOPTIONS32" \ + CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ + ./configure --prefix=/usr \ + --libdir=/usr/$LIBDIR + make -j $NUMCPU + make -j $NUMCPU DESTDIR=$TMPROOT install + make distclean } #Hier wird der Make Prozess der Sourcen definiert mk() { - make CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" && + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ + ./configure --prefix=/usr \ + --libdir=/usr/$LIBDIR + make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install - if [ ! -d $TMPROOT/usr/share ]; then - mkdir -p $TMPROOT/usr/share - fi - mv $TMPROOT/man $TMPROOT/usr/share } #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann #in $TMPROOT noch einiges korrigieren postmk() { - if [ ! -d $TMPROOT/usr/share ]; then - mkdir $TMPROOT/usr/share/ - fi - mv $TMPROOT/man $TMPROOT/usr/share GetSVN Viitor_iptables $TMPROOT } diff --git a/SysBuild/tools/pks b/SysBuild/tools/pks index 6d28f7f..c2c08bf 100644 --- a/SysBuild/tools/pks +++ b/SysBuild/tools/pks @@ -76,9 +76,10 @@ premk() { echo "Nothing to do for premk()" } -mk() { - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ +mk32() { + CC="gcc $BUILDOPTIONS32" \ + CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --sysconfdir=/etc \ --localstatedir=/var/lib/pksd \ @@ -87,6 +88,22 @@ mk() { --prefix=/usr make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install + make distclean + mv $TMPROOT/usr/lib{,-32} +} + +mk() { + CC="gcc $BUILDOPTIONS" \ + CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ + ./configure --target=$TARGET \ + --sysconfdir=/etc \ + --localstatedir=/var/lib/pksd \ + --datadir=/var/lib/pksd \ + --libdir=/usr/$LIBDIR \ + --prefix=/usr + make -j $NUMCPU + make -j $NUMCPU DESTDIR=$TMPROOT install } postmk() { @@ -94,4 +111,8 @@ postmk() { for i in MRHKP NEWS README UPGRADING; do cp $i $TMPROOT/usr/share/doc/pks done + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/lib{,64} + mv $TMPROOT/usr/lib-32 $TMPROOT/usr/lib + fi } diff --git a/SysBuild/tools/popt b/SysBuild/tools/popt index 5b3119d..f7d89e8 100644 --- a/SysBuild/tools/popt +++ b/SysBuild/tools/popt @@ -83,6 +83,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/usr && make -j $NUMCPU && @@ -97,6 +98,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ $ADDOPTIONS \ --prefix=/usr && diff --git a/SysBuild/tools/ppp b/SysBuild/tools/ppp index 1059ae9..a130a1b 100644 --- a/SysBuild/tools/ppp +++ b/SysBuild/tools/ppp @@ -74,13 +74,39 @@ premk() { echo "Nothing to do for premk()" } +mk32() { + # Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen. + # Den \ nicht vergessen ! + CC="gcc $BUILDOPTIONS32" \ + CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ + ./configure --host=$TARGET32 \ + --target=$TARGET32 + + CheckError "Configurescript failed !" 1 + + # Make-Optionen eintragen + make -j $NUMCPU CC="gcc $BUILDOPTIONS32" + CheckError "Makeprocess failed !" 1 + + # Make install Optionen eintragen + make -j $NUMCPU DESTDIR=$TMPROOT install + CheckError "Make install process failed !" 1 + make clean + echo "ready" + read +} + mk() { # Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen. # Den \ nicht vergessen ! + find . -name "[mM]akefile*" -exec sed -i -e "s%/lib%/$LIBDIR%g" {} \; CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ - --target=$TARGET + --target=$TARGET \ + --libdir=$LIBDIR CheckError "Configurescript failed !" 1 diff --git a/SysBuild/tools/rinetd b/SysBuild/tools/rinetd index 02872df..755e15b 100644 --- a/SysBuild/tools/rinetd +++ b/SysBuild/tools/rinetd @@ -84,7 +84,7 @@ premk() { mk() { make -j $NUMCPU \ CC="gcc -DLINUX $BUILDOPTIONS" \ - CXX="g++ -DLINUX $BUILDOPTIONS" + CXX="g++ -DLINUX $BUILDOPTIONS" mkdir -p $TMPROOT/usr/sbin mkdir -p $TMPROOT/usr/share/man/man8 cp rinetd $TMPROOT/usr/sbin diff --git a/SysBuild/xsys/PDL b/SysBuild/xsys/PDL index 24f738d..0d4bbb9 100644 --- a/SysBuild/xsys/PDL +++ b/SysBuild/xsys/PDL @@ -81,9 +81,25 @@ premk() { CheckError "premk() failed !" 1 } +mk32() { + export USE_ARCH=$UARCH + perl-32 Makefile.PL PREFIX=$TMPROOT/usr CC="gcc $BUILDOPTIONS32" CXX="g++ $BUILDOPTIONS32" + CheckError "Configurescript failed !" 1 + + # Make-Optionen eintragen + make -j $NUMCPU + make -j $NUMCPU doctest + CheckError "Makeprocess failed !" 1 + + # Make install Optionen eintragen + make -j $NUMCPU PREFIX=$TMPROOT/usr install + CheckError "Make install process failed !" 1 + make distclean + unset USE_ARCH +} + mk() { - # Hier die ./configure --build=$HOSTSYS --target=$HOSTSYS-Optionen eintragen. - # Den \ nicht vergessen ! + export USE_ARCH=$UARCH perl Makefile.PL PREFIX=$TMPROOT/usr CheckError "Configurescript failed !" 1 @@ -95,6 +111,7 @@ mk() { # Make install Optionen eintragen make -j $NUMCPU PREFIX=$TMPROOT/usr install CheckError "Make install process failed !" 1 + unset USE_ARCH } postmk() { diff --git a/SysBuild/xsys/dbus-glib b/SysBuild/xsys/dbus-glib index 595254c..37f3348 100644 --- a/SysBuild/xsys/dbus-glib +++ b/SysBuild/xsys/dbus-glib @@ -80,8 +80,8 @@ mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ USE_ARCH=$UARCH \ - ./configure --target=$TARGET \ - --prefix=/usr/X11R7 + ./configure --target=$TARGET32 \ + --prefix=/usr/ make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install make distclean @@ -97,7 +97,7 @@ mk() { USE_ARCH=$UARCH \ ./configure --target=$TARGET \ $ADDOPTIONS \ - --prefix=/usr/X11R7 + --prefix=/usr/ make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install }