From dff19da6537b7291dea3ec510b1be5e95bc268b0 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Wed, 2 Jun 2010 07:19:59 +0000
Subject: [PATCH] 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
---
 SysBuild/development/PyQt-x11-gpl | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/SysBuild/development/PyQt-x11-gpl b/SysBuild/development/PyQt-x11-gpl
index fb71905..5620a01 100644
--- a/SysBuild/development/PyQt-x11-gpl
+++ b/SysBuild/development/PyQt-x11-gpl
@@ -75,24 +75,30 @@ premk() {
 }
 
 mk32() {
-	CC="gcc $BUILDOPTIONS32" \
-	CXX="g++ $BUILDOPTIONS32" \
+	CFLAGS="$BUILDOPTIONS32" \
+	CXXFLAGS="$BUILDOPTIONS32" \
 	USE_ARCH=32 \
 	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 clean
+	cd ..
+	rm -r PyQt-x11-gpl*
+	tar -xvf $SOURCE/$SRCPATH/PyQt-x11-gpl*.tar.*
+	cd PyQt-x11-gpl*
 }
 
 mk() {
-	if [ "$MK64BIT" == "true" ]; then
-		ADDOPTIONS="--libdir=\${prefix}/lib64"
-	fi
-	CC="gcc $BUILDOPTIONS" \
-	CXX="g++ $BUILDOPTIONS" \
+	CFLAGS="$BUILDOPTIONS" \
+	CXXFLAGS="$BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	python configure.py --confirm-license
-	make -j $NUMCPU
+	make -j $NUMCPU \
+	     CFLAGS="$BUILDOPTIONS -fPIC" \
+	     CXXFLAGS="$BUILDOPTIONS -fPIC" 
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }