diff --git a/SysBuild/BuildCluster/BaseLibs.dmk b/SysBuild/BuildCluster/BaseLibs.dmk index 6a00e78..e20f1d7 100644 --- a/SysBuild/BuildCluster/BaseLibs.dmk +++ b/SysBuild/BuildCluster/BaseLibs.dmk @@ -32,9 +32,9 @@ 0 tools/libsmi 0 tools/lzo 0 tools/libghttp -0 tools/jpegsrc +32 tools/jpegsrc 0 tools/lcms -0 tools/libmng +64 tools/libmng 0 tools/glib-2 0 tools/glib-1 0 tools/glibmm diff --git a/SysBuild/tools/jpegsrc b/SysBuild/tools/jpegsrc index db26a85..599c7f3 100644 --- a/SysBuild/tools/jpegsrc +++ b/SysBuild/tools/jpegsrc @@ -96,7 +96,10 @@ mk32() { make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install-headers cp jmemsys.h $TMPROOT/usr/include make distclean - gcc -fPIC -m32 -shared -Wl,-soname,libjpeg.so.62.0.0 -o $TMPROOT/usr/lib/libjpeg6b.so.62.0.0 $TMPROOT/usr/lib/libjpeg.a + GenDynLib32 $TMPROOT/usr/lib/libjpeg.a 62.0.0 + ln -s libjpeg.so.62.0.0 libjpeg6b.so.62.0.0 + ln -s libjpeg.so.62.0.0 libjpeg6n.so.62.0 + ln -s libjpeg.so.62.0.0 libjpeg6n.so.62 } #Hier wird der Make Prozess der Sourcen definiert @@ -118,17 +121,15 @@ mk() { make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install-lib make -j $NUMCPU libdir=/usr/$LIBDIR DESTDIR=$TMPROOT install-headers cp jmemsys.h $TMPROOT/usr/include - gcc -fPIC -m$UARCH -shared -Wl,-soname,libjpeg.so.62.0.0 -o $TMPROOT/usr/$LIBDIR/libjpeg6b.so.62.0.0 $TMPROOT/usr/$LIBDIR/libjpeg.a + GenDynLib32 $TMPROOT/usr/$LIBDIR/libjpeg.a 62.0.0 + ln -s libjpeg.so.62.0.0 libjpeg6b.so.62.0.0 + ln -s libjpeg.so.62.0.0 libjpeg6n.so.62.0 + ln -s libjpeg.so.62.0.0 libjpeg6n.so.62 } #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann #in $TMPROOT noch einiges korrigieren postmk() { - ln -s libjpeg.so.62.0.0 $TMPROOT/usr/lib/libjpeg6b.so - cd $TMPROOT - if [ "$MK64BIT" == "true" ]; then - ln -s libjpeg.so.62.0.0 $TMPROOT/usr/lib64/libjpeg6b.so - fi mkdir -p usr/share mv usr/man usr/share }