diff --git a/SysBuild/BuildCluster/BaseSysTools.dmk b/SysBuild/BuildCluster/BaseSysTools.dmk index 3756d9d..9283748 100755 --- a/SysBuild/BuildCluster/BaseSysTools.dmk +++ b/SysBuild/BuildCluster/BaseSysTools.dmk @@ -72,11 +72,9 @@ 0 tools/ez-ipupdate 0 tools/popt 0 tools/iptables -0 tools/pks 0 tools/aircrack-ng 0 tools/ppp 0 tools/gdbm - 0 tools/dbus-glib 0 tools/ypbind-mt 0 tools/yp-tools @@ -84,6 +82,7 @@ 0 tools/rp-pppoe 0 tools/netkit-bootparamd 0 tools/tsocks +0 tools/tcp_wrappers 0 tools/nfs-utils 0 tools/traceroute 0 tools/openal @@ -91,6 +90,7 @@ 0 tools/audiofile 0 tools/toolame 0 tools/a52dec + 0 tools/wav2cdr 0 tools/bladeenc 0 tools/dmake @@ -137,6 +137,7 @@ 0 tools/doxygen 0 tools/dvd+rw-tools 0 tools/db +0 tools/pks 0 xsys/isdn4k-utils 0 tools/ntp 0 tools/amanda diff --git a/SysBuild/tools/a52dec b/SysBuild/tools/a52dec index 15ca566..feaea91 100644 --- a/SysBuild/tools/a52dec +++ b/SysBuild/tools/a52dec @@ -83,6 +83,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32 -fPIC" \ CXX="g++ $BUILDOPTIONS32 -fPIC" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/usr \ --enable-shared \ @@ -90,6 +91,13 @@ mk32() { make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install make distclean + mkdir /tmp/a52dec + cd /tmp/a52dec + ar -x $TMPROOT/usr/lib/liba52.a + gcc $BUILDOPTIONS32 -fPIC -shared -Wl,-soname,liba52.so.0 \ + -o $TMPROOT/usr/lib/liba52.so.0.7.4 *.o + cd - + rm -r /tmp/a52dec } #Hier wird der Make Prozess der Sourcen definiert @@ -99,6 +107,7 @@ mk() { fi CC="gcc $BUILDOPTIONS -fPIC" \ CXX="g++ $BUILDOPTIONS -fPIC" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ --prefix=/usr \ $ADDOPTIONS \ @@ -106,6 +115,13 @@ mk() { --enable-double make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install + mkdir /tmp/a52dec + cd /tmp/a52dec + ar -x $TMPROOT/usr/$LIBDIR/liba52.a + gcc $BUILDOPTIONS -fPIC -shared -Wl,-soname,liba52.so.0 \ + -o $TMPROOT/usr/$LIBDIR/liba52.so.0.7.4 *.o + cd - + rm -r /tmp/a52dec } #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann diff --git a/SysBuild/tools/audiofile b/SysBuild/tools/audiofile index 991f088..6de393a 100644 --- a/SysBuild/tools/audiofile +++ b/SysBuild/tools/audiofile @@ -81,8 +81,9 @@ premk() { } mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ + CC="gcc $BUILDOPTIONS32 -fPIC" \ + CXX="g++ $BUILDOPTIONS32 -fPIC" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --prefix=/usr \ --with-gnu-ld && @@ -90,14 +91,23 @@ mk32() { make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 make distclean + mkdir /tmp/audiofile + cd /tmp/audiofile + ar -x $TMPROOT/usr/lib/libaudiofile.a + gcc $BUILDOPTIONS32 -fPIC -shared -Wl,-soname,libaudiofile.so.0 \ + -o $TMPROOT/usr/lib/libaudiofile.so.0.2.6 *.o + cd - + rm -r /tmp/audiofile + mv $TMPROOT/usr/bin/audiofile-config{,-32} } mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" fi - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ + CC="gcc $BUILDOPTIONS -fPIC" \ + CXX="g++ $BUILDOPTIONS -fPIC" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ $ADDOPTIONS \ --prefix=/usr \ @@ -105,8 +115,19 @@ mk() { make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 + mkdir /tmp/audiofile + cd /tmp/audiofile + ar -x $TMPROOT/usr/$LIBDIR/libaudiofile.a + gcc $BUILDOPTIONS -fPIC -shared -Wl,-soname,libaudiofile.so.0 \ + -o $TMPROOT/usr/$LIBDIR/libaudiofile.so.0.2.6 *.o + cd - + rm -r /tmp/audiofile + } postmk() { - echo "Nothing to do for postmk()" + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/bin/audiofile-config{,-64} + ln -s multiarch_wrapper $TMPROOT/usr/bin/audiofile-config + fi } diff --git a/SysBuild/xsys/dbus-glib b/SysBuild/tools/dbus-glib similarity index 100% rename from SysBuild/xsys/dbus-glib rename to SysBuild/tools/dbus-glib diff --git a/SysBuild/tools/gdbm b/SysBuild/tools/gdbm index 44d0f9e..2e9d9a2 100644 --- a/SysBuild/tools/gdbm +++ b/SysBuild/tools/gdbm @@ -76,17 +76,23 @@ SRCPATH=Tools/Database #Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen premk() { - echo "Nothing to do for premk()" + echo "Nothing to do for premk" } mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - USE_ARCH=$UARCH \ - ./configure --host=$TARGET32 \ - --prefix=/usr \ - --with-gnu-ld && + CC="gcc $BUILDOPTIONS32 -fPIC" \ + CXX="g++ $BUILDOPTIONS32 -fPIC" \ + ./configure --prefix=/usr && make -j $NUMCPU && + mkdir tmplib && + cd tmplib && + ar -x ../.libs/libgdbm.a && + gcc -shared -m32 -Wl,-soname,libgdbm.so.3 -o ../.libs/libgdbm.so.3.0.0 *.o && + rm -r *.o && + ar -x ../.libs/libgdbm_compat.a && + gcc -shared -m32 -Wl,-soname,libgdbm_compat.so.3 -o ../.libs/libgdbm_compat.so.3.0.0 *.o && + cd .. && + rm -r tmplib && make -j $NUMCPU INSTALL_ROOT=$TMPROOT install make -j $NUMCPU INSTALL_ROOT=$TMPROOT install-compat make distclean @@ -97,15 +103,21 @@ mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" fi - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ - USE_ARCH=$UARCH \ - ./configure --host=$TARGET \ - --prefix=/usr \ - $ADDOPTIONS \ - --with-gnu-ld && + CC="gcc $BUILDOPTIONS -fPIC" \ + CXX="g++ $BUILDOPTIONS -fPIC" \ + ./configure $ADDOPTIONS \ + --prefix=/usr && make -j $NUMCPU && - make -j $NUMCPU INSTALL_ROOT=$TMPROOT install + mkdir tmplib && + cd tmplib && + ar -x ../.libs/libgdbm.a && + gcc $BUILDOPTIONS -shared -Wl,-soname,libgdbm.so.3 -o ../.libs/libgdbm.so.3.0.0 *.o && + rm -r *.o && + ar -x ../.libs/libgdbm_compat.a && + gcc $BUILDOPTIONS -shared -Wl,-soname,libgdbm_compat.so.3 -o ../.libs/libgdbm_compat.so.3.0.0 *.o && + cd .. && + rm -r tmplib && + make -j $NUMCPU INSTALL_ROOT=$TMPROOT install && make -j $NUMCPU INSTALL_ROOT=$TMPROOT install-compat } diff --git a/SysBuild/tools/jpegsrc b/SysBuild/tools/jpegsrc index a2ca141..64d9b94 100644 --- a/SysBuild/tools/jpegsrc +++ b/SysBuild/tools/jpegsrc @@ -127,7 +127,7 @@ postmk() { ln -s libjpeg.so.62.0.0 $TMPROOT/usr/lib/libjpeg6b.so cd $TMPROOT if [ "$MK64BIT" == "true" ]; then - ln -s libjpeg.so.64.0.0 $TMPROOT/usr/lib64/libjpeg6b.so + ln -s libjpeg.so.62.0.0 $TMPROOT/usr/lib64/libjpeg6b.so fi mkdir -p usr/share mv usr/man usr/share diff --git a/SysBuild/tools/lcms b/SysBuild/tools/lcms index c9128b1..b0a883a 100644 --- a/SysBuild/tools/lcms +++ b/SysBuild/tools/lcms @@ -84,6 +84,7 @@ mk32() { make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install ClearHostSysNameing32 $TMPROOT + find . -name "*.o" -exec rm {} \; } mk() { diff --git a/SysBuild/tools/openal b/SysBuild/tools/openal index 57a5d61..65e6868 100644 --- a/SysBuild/tools/openal +++ b/SysBuild/tools/openal @@ -73,17 +73,18 @@ SRCPATH=Tools/lib premk() { echo "Nothing to do for premk()" - ./autogen.sh } mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ - ./configure --host=$TARGET32 \ + USE_ARCH=$UARCH \ + ./configure --build=$TARGET32 \ --prefix=/usr - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install + make + make DESTDIR=$TMPROOT install make distclean + mv $TMPROOT/usr/bin/openal-config{,-32} } mk() { @@ -92,14 +93,19 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - ./configure --host=$BUILDSYS \ + USE_ARCH=$UARCH \ + ./configure --build=$BUILDSYS \ $ADDOPTIONS \ --prefix=/usr - make -j $NUMCPU - make -j $NUMCPU DESTDIR=$TMPROOT install + make + make DESTDIR=$TMPROOT install cd - } postmk() { + if [ "$MK64BIT" == "true" ]; then + mv $TMPROOT/usr/bin/openal-config{,-64} + ln -s multiarch_wrapper $TMPROOT/usr/bin/openal-config + fi ClearHostSysNameing $TMPROOT } diff --git a/SysBuild/tools/ppp b/SysBuild/tools/ppp index a130a1b..a8e2252 100644 --- a/SysBuild/tools/ppp +++ b/SysBuild/tools/ppp @@ -93,8 +93,6 @@ mk32() { make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 make clean - echo "ready" - read } mk() { diff --git a/SysBuild/tools/rp-pppoe b/SysBuild/tools/rp-pppoe index 59e671a..aca55b4 100644 --- a/SysBuild/tools/rp-pppoe +++ b/SysBuild/tools/rp-pppoe @@ -95,13 +95,12 @@ mk() { CheckError "Makeprocess failed !" 1 # Make install Optionen eintragen - make -j $NUMCPU RPM_INSTALL_ROOT=$TMPROOT install + make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 } postmk() { - cd $TMPROOT - mkdir usr/share - mv usr/man usr/share + mkdir $TMPROOT/usr/share + mv $TMPROOT/usr/man $TMPROOT/usr/share GetSVN Viitor_rp-pppoe $TMPROOT } diff --git a/SysBuild/tools/tcp_wrappers b/SysBuild/tools/tcp_wrappers index cdef59b..9393d1a 100644 --- a/SysBuild/tools/tcp_wrappers +++ b/SysBuild/tools/tcp_wrappers @@ -76,6 +76,7 @@ SRCPATH=Tools/Net premk() { mkdir -p $TMPROOT/usr/{lib,sbin} mkdir -p $TMPROOT/usr/share/man/man{3,5,8} + mkdir -p $TMPROOT/usr/include } mk32() { @@ -108,6 +109,7 @@ mk() { rm -r *.o cd - rm -r /tmp/libwrap + cp *.h $TMPROOT/usr/include } postmk() { diff --git a/SysBuild/tools/tsocks b/SysBuild/tools/tsocks index 2cca71c..cfe77ff 100644 --- a/SysBuild/tools/tsocks +++ b/SysBuild/tools/tsocks @@ -84,6 +84,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS32" \ CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --x-includes=/usr/X11R7/include \ --x-libraries=/usr/X11R7/lib \ @@ -99,6 +100,7 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --target=$TARGET \ $ADDOPTIONS \ --x-includes=/usr/X11R7/include \