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"