diff --git a/SysBuild/tools/cpufreqd b/SysBuild/tools/cpufreqd index 9cd942c..4635e50 100644 --- a/SysBuild/tools/cpufreqd +++ b/SysBuild/tools/cpufreqd @@ -76,6 +76,19 @@ premk() { echo "Nothing to do for premk()" } +mk32() { + LDFLAGS="-Wl,-rpath-link,/usr/lib" \ + CC="gcc $BUILDOPTIONS32" \ + CXX="g++ $BUILDOPTIONS32" \ + USE_ARCH=$UARCH \ + ./configure --build=$TARGET32 \ + --prefix=/usr \ + --sysconfdir=/etc/sysconfig + make -j $NUMCPU + make -j $NUMCPU DESTDIR=$TMPROOT install + make distclean +} + mk() { if [ "$MK64BIT" == "true" ]; then ADDOPTIONS="--libdir=/usr/lib64" @@ -83,7 +96,7 @@ mk() { LDFLAGS="-Wl,-rpath-link,/usr/$LIBDIR" \ CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - ./configure --host=$BUILDSYS \ + ./configure --build=$BUILDSYS \ $ADDOPTIONS \ --prefix=/usr \ --sysconfdir=/etc/sysconfig diff --git a/SysBuild/tools/dbus b/SysBuild/tools/dbus index cb008f7..fa07ef9 100644 --- a/SysBuild/tools/dbus +++ b/SysBuild/tools/dbus @@ -106,6 +106,7 @@ mk() { ../dbus*/configure --prefix=/usr \ $ADDOPTIONS \ --sysconfdir=/etc/sysconfig/dbus \ + --libexecdir=/usr/$LIBDIR/dbus-1.0 \ --localstatedir=/var && make -j $NUMCPU && make -j $NUMCPU install && diff --git a/SysBuild/tools/libfame b/SysBuild/tools/libfame index 465a3eb..5ad22ee 100644 --- a/SysBuild/tools/libfame +++ b/SysBuild/tools/libfame @@ -81,8 +81,8 @@ premk() { } mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ + CC="gcc $BUILDOPTIONS32 -fPIC" \ + CXX="g++ $BUILDOPTIONS32 -fPIC" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ --prefix=/usr \ @@ -94,6 +94,7 @@ mk32() { make distclean ClearHostSysNameing32 $TMPROOT mv $TMPROOT/usr/bin/libfame-config{,-32} + GenDynLib32 $TMPROOT/usr/lib/libfame.a 0.9.1 } #Hier wird der Make Prozess der Sourcen definiert @@ -101,8 +102,8 @@ 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 --target=$TARGET \ --prefix=/usr \ @@ -110,6 +111,7 @@ mk() { --enable-mmx && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install + GenDynLib $TMPROOT/usr/$LIBDIR/libfame.a 0.9.1 } #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann diff --git a/SysBuild/tools/libghttp b/SysBuild/tools/libghttp index c060de4..e82dfb3 100644 --- a/SysBuild/tools/libghttp +++ b/SysBuild/tools/libghttp @@ -82,32 +82,34 @@ premk() { } mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ + CC="gcc $BUILDOPTIONS32 -fPIC" \ + CXX="g++ $BUILDOPTIONS32 -fPIC" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ - --prefix=/usr/X11R7 \ + --prefix=/usr \ --with-gnu-ld && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 make distclean + GenDynLib32 $TMPROOT/usr/lib/libghttp.a 1.0.9 } mk() { if [ "$MK64BIT" == "true" ];then - ADDOPTIONS="--libdir=/usr/X11R7/lib64" + ADDOPTIONS="--libdir=/usr/lib64" fi - CC="gcc $BUILDOPTIONS" \ - CXX="g++ $BUILDOPTIONS" \ + CC="gcc $BUILDOPTIONS -fPIC" \ + CXX="g++ $BUILDOPTIONS -fPIC" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET \ - --prefix=/usr/X11R7 \ + --prefix=/usr \ $ADDOPTIONS \ --with-gnu-ld && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install CheckError "Make install process failed !" 1 + GenDynLib $TMPROOT/usr/$LIBDIR/libghttp.a 1.0.9 } postmk() { diff --git a/SysBuild/tools/tsocks b/SysBuild/tools/tsocks index cfe77ff..55d07b1 100644 --- a/SysBuild/tools/tsocks +++ b/SysBuild/tools/tsocks @@ -86,6 +86,7 @@ mk32() { CXX="g++ $BUILDOPTIONS32" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET32 \ + --libdir=\${prefix}/lib \ --x-includes=/usr/X11R7/include \ --x-libraries=/usr/X11R7/lib \ --prefix=/usr @@ -95,14 +96,11 @@ mk32() { } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="--libdir=\${prefix}/lib64" - fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ USE_ARCH=$UARCH \ ./configure --target=$TARGET \ - $ADDOPTIONS \ + --libdir=\${prefix}/$LIBDIR \ --x-includes=/usr/X11R7/include \ --x-libraries=/usr/X11R7/$LIBDIR \ --prefix=/usr @@ -111,6 +109,5 @@ mk() { } postmk() { - mkdir -p $TMPROOT/usr/lib - cp -a $TMPROOT/lib/* $TMPROOT/usr/lib + echo "Nothing to do for postmk()" }