Some more tweaks for python

bootstrap-carla.sh

@@ -145,6 +145,12 @@ function build_pyqt() {
         sed -i -e 's/CXXFLAGS *=/CXXFLAGS +=/' */Makefile
         sed -i -e 's/LIBS *=/LIBS += $(LDFLAGS)/' */Makefile
 
+        if [ -f "QtCore/Makefile.Release" ]; then
+            sed -i -e 's/CFLAGS *=/CFLAGS +=/' */Makefile.Release
+            sed -i -e 's/CXXFLAGS *=/CXXFLAGS +=/' */Makefile.Release
+            sed -i -e 's/LIBS *=/LIBS += $(LDFLAGS)/' */Makefile.Release
+        fi
+
         # use abstract python3 path
         sed -i -e 's|/usr/bin/python3|python3|g' Makefile
 

setup/functions.sh

@@ -375,7 +375,9 @@ function build_python() {
     local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}"
     local python=python3
 
-    if [ ! -e "${PAWPAW_PREFIX}/bin/python3" ] && ! which python3 > /dev/null; then
+    if [ "${CROSS_COMPILING}" -eq 1 ]; then
+        python="${EXE_WRAPPER} ${PAWPAW_PREFIX}/bin/python3${APP_EXT}"
+    elif [ ! -e "${PAWPAW_PREFIX}/bin/python3" ] && ! which python3 > /dev/null; then
         python=python
     fi
 

setup/versions.sh

@@ -76,6 +76,7 @@ if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
     ZIPP_VERSION=3.4.0
 elif [ "${WIN32}" -eq 1 ]; then
     PYTHON_VERSION=3.8.7
+    PYLIBLO_VERSION=0.9.2
     PYQT5_VERSION=5.13.1
     SIP_VERSION=4.19.19
 else