Diverse Korrekturen, so das jetzt 32 und 64 bit Build funktionieren
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5698 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
5616e6e324
commit
dff19da653
@ -75,24 +75,30 @@ premk() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
mk32() {
|
mk32() {
|
||||||
CC="gcc $BUILDOPTIONS32" \
|
CFLAGS="$BUILDOPTIONS32" \
|
||||||
CXX="g++ $BUILDOPTIONS32" \
|
CXXFLAGS="$BUILDOPTIONS32" \
|
||||||
USE_ARCH=32 \
|
USE_ARCH=32 \
|
||||||
python configure.py --confirm-license
|
python configure.py --confirm-license
|
||||||
make -j $NUMCPU
|
find . -name "Makefile" -exec sed -i "s/\((LFLAGS)\)/\1 -m32/" {} \;
|
||||||
|
make -j $NUMCPU \
|
||||||
|
CFLAGS="$BUILDOPTIONS32" \
|
||||||
|
CXXFLAGS="$BUILDOPTIONS32" \
|
||||||
|
LDEMULATION="elf32_i386"
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
make clean
|
cd ..
|
||||||
|
rm -r PyQt-x11-gpl*
|
||||||
|
tar -xvf $SOURCE/$SRCPATH/PyQt-x11-gpl*.tar.*
|
||||||
|
cd PyQt-x11-gpl*
|
||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
CFLAGS="$BUILDOPTIONS" \
|
||||||
ADDOPTIONS="--libdir=\${prefix}/lib64"
|
CXXFLAGS="$BUILDOPTIONS" \
|
||||||
fi
|
|
||||||
CC="gcc $BUILDOPTIONS" \
|
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
python configure.py --confirm-license
|
python configure.py --confirm-license
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU \
|
||||||
|
CFLAGS="$BUILDOPTIONS -fPIC" \
|
||||||
|
CXXFLAGS="$BUILDOPTIONS -fPIC"
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user