From 203bb1bb630e39527831ab11631616f478613162 Mon Sep 17 00:00:00 2001 From: kueller Date: Tue, 16 Aug 2011 06:44:37 +0000 Subject: [PATCH] Compile Fehler behoben - deklarations fehler mit neuer Compiler wversion.. git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6167 504e572c-2e33-0410-9681-be2bf7408885 --- SysBuild/development/PyQt-x11-gpl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SysBuild/development/PyQt-x11-gpl b/SysBuild/development/PyQt-x11-gpl index 612401d..53c5c79 100644 --- a/SysBuild/development/PyQt-x11-gpl +++ b/SysBuild/development/PyQt-x11-gpl @@ -82,12 +82,16 @@ mk32() { python configure.py --confirm-license find . -name "Makefile" -exec sed -i "s/\((LFLAGS)\)/\1 -m32/" {} \; find . -name "Makefile" -exec sed -i "s/\(-shared\)/-m32 \1/g" {} \; + cp designer/pluginloader.cpp{,.orig} + PYTHON_LIB=$(grep PYTHON_LIB designer/python.pro|awk -F"=" '{print $3}'|sed -e "s/\\\//g") + sed -i "s/PYTHON_LIB/${PYTHON_LIB}/" designer/pluginloader.cpp make -j $NUMCPU \ CFLAGS="$BUILDOPTIONS32" \ CXXFLAGS="$BUILDOPTIONS32" \ LDEMULATION="elf32_i386" make -j $NUMCPU DESTDIR=$TMPROOT install make clean + cp designer/pluginloader.cpp.orig designer/pluginloader.cpp } mk() { @@ -96,6 +100,8 @@ mk() { USE_ARCH=$UARCH \ QMAKESPEC=linux-g++-$UARCH \ python configure.py --confirm-license + PYTHON_LIB=$(grep PYTHON_LIB designer/python.pro|awk -F"=" '{print $3}'|sed -e "s/\\\//g") + sed -i "s/PYTHON_LIB/${PYTHON_LIB}/" designer/pluginloader.cpp make -j $NUMCPU \ CFLAGS="$BUILDOPTIONS -fPIC" \ CXXFLAGS="$BUILDOPTIONS -fPIC"