Die libs werden jetzt auch dynamisch gebaut und die *.la files entsprechend
angepasst git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6069 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
62a86c58ec
commit
bc2816240c
@ -109,10 +109,15 @@ mk32() {
|
|||||||
cd ../Build-ImageMagick
|
cd ../Build-ImageMagick
|
||||||
ClearHostSysNameing32 $TMPROOT
|
ClearHostSysNameing32 $TMPROOT
|
||||||
mv $TMPROOT/usr/bin/Magick++-config{,-32}
|
mv $TMPROOT/usr/bin/Magick++-config{,-32}
|
||||||
mv $TMPROOT/usr/bin/MagickWand-config{,32}
|
mv $TMPROOT/usr/bin/MagickWand-config{,-32}
|
||||||
mv $TMPROOT/usr/bin/MagickCore-config{,32}
|
mv $TMPROOT/usr/bin/MagickCore-config{,-32}
|
||||||
mv $TMPROOT/usr/bin/Wand-config{,32}
|
mv $TMPROOT/usr/bin/Wand-config{,-32}
|
||||||
mv $TMPROOT/usr/bin/Magick-config{,32}
|
mv $TMPROOT/usr/bin/Magick-config{,-32}
|
||||||
|
for i in libMagickCore libMagick++ libMagickWand; do
|
||||||
|
GenDynLib32 $TMPROOT/usr/lib/$i.a 6.6.9
|
||||||
|
sed -i "s/^\(dlname=\)/\1\'$i\'/" $TMPROOT/usr/lib/$i.la
|
||||||
|
sed -i "s/^\(library_names=\)/\1\'$i.so $i.so.6 $i.so.6.6.9\'/" $TMPROOT/usr/lib/$i.la
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
#Hier wird der Make Prozess der Sourcen definiert
|
#Hier wird der Make Prozess der Sourcen definiert
|
||||||
@ -131,6 +136,11 @@ mk() {
|
|||||||
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS" &&
|
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS" &&
|
||||||
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS" install
|
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS" install
|
||||||
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS" DESTDIR=$TMPROOT install
|
make -j $NUMCPU CC="gcc -fPIC $BUILDOPTIONS" DESTDIR=$TMPROOT install
|
||||||
|
for i in libMagickCore libMagick++ libMagickWand; do
|
||||||
|
GenDynLib $TMPROOT/usr/${LIBDIR}/$i.a 6.6.9
|
||||||
|
sed -i "s/^\(dlname=\)/\1\'$i.so\'/" $TMPROOT/usr/${LIBDIR}/$i.la
|
||||||
|
sed -i "s/^\(library_names=\)/\1\'$i.so $i.so.6 $i.so.6.6.9\'/" $TMPROOT/usr/${LIBDIR}/$i.la
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
|
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
|
||||||
@ -141,10 +151,10 @@ postmk() {
|
|||||||
ClearHostSysNameing $TMPROOT
|
ClearHostSysNameing $TMPROOT
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
if [ "$MK64BIT" == "true" ]; then
|
||||||
mv $TMPROOT/usr/bin/Magick++-config{,-64}
|
mv $TMPROOT/usr/bin/Magick++-config{,-64}
|
||||||
mv $TMPROOT/usr/bin/MagickWand-config{,64}
|
mv $TMPROOT/usr/bin/MagickWand-config{,-64}
|
||||||
mv $TMPROOT/usr/bin/MagickCore-config{,64}
|
mv $TMPROOT/usr/bin/MagickCore-config{,-64}
|
||||||
mv $TMPROOT/usr/bin/Wand-config{,64}
|
mv $TMPROOT/usr/bin/Wand-config{,-64}
|
||||||
mv $TMPROOT/usr/bin/Magick-config{,64}
|
mv $TMPROOT/usr/bin/Magick-config{,-64}
|
||||||
ln -s multiarch_wrapper $TMPROOT/usr/bin/Magick++-config
|
ln -s multiarch_wrapper $TMPROOT/usr/bin/Magick++-config
|
||||||
ln -s multiarch_wrapper $TMPROOT/usr/bin/MagickWand-config
|
ln -s multiarch_wrapper $TMPROOT/usr/bin/MagickWand-config
|
||||||
ln -s multiarch_wrapper $TMPROOT/usr/bin/MagickCore-config
|
ln -s multiarch_wrapper $TMPROOT/usr/bin/MagickCore-config
|
||||||
|
Loading…
Reference in New Issue
Block a user