Only optimize python in macos-universal builds for now

bootstrap-carla.sh

@@ -83,9 +83,13 @@ fi
 # ---------------------------------------------------------------------------------------------------------------------
 # python
 
+if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
+    PYTHON_EXTRAFLAGS = "--enable-optimizations"
+fi
+
 download Python "${PYTHON_VERSION}" "https://www.python.org/ftp/python/${PYTHON_VERSION}" "tgz"
 patch_file Python "${PYTHON_VERSION}" "Modules/Setup.dist" 's/#zlib zlibmodule.c/zlib zlibmodule.c/'
-build_conf Python "${PYTHON_VERSION}" "--prefix=${PAWPAW_PREFIX} --enable-optimizations --enable-shared"
+build_conf Python "${PYTHON_VERSION}" "--prefix=${PAWPAW_PREFIX} --enable-shared ${PYTHON_EXTRAFLAGS}"
 
 # ---------------------------------------------------------------------------------------------------------------------
 # sip

bootstrap-plugins.sh

@@ -136,16 +136,7 @@ build_waf lilv "${LILV_VERSION}" "--static --no-bash-completion --no-bindings --
 # ---------------------------------------------------------------------------------------------------------------------
 # lv2lint
 
-LV2LINT_SUPPORTED="true"
-
-if [ "${MACOS_OLD}" -eq 1 ] || [ "${CROSS_COMPILING}" -eq 1 ]; then
-    LV2LINT_SUPPORTED="false"
-fi
-if [ "${MACOS}" -eq 1 ] && [ "$(uname -r)" = "12.6.0" ]; then
-    LV2LINT_SUPPORTED="false"
-fi
-
-if [ "${LV2LINT_SUPPORTED}" = "true" ]; then
+if [ "${LV2LINT_SUPPORTED}" -eq 1 ]; then
     download lv2lint "${LV2LINT_VERSION}" "https://gitlab.com/OpenMusicKontrollers/lv2lint/-/archive/${LV2LINT_VERSION}"
     build_meson lv2lint "${LV2LINT_VERSION}"
     # "-Donline-tests=true -Delf-tests=true"

bootstrap-qt.sh

@@ -282,7 +282,7 @@ fi
 
 build_qt_conf qtbase "${qtbase_conf_args}"
 
-if [ "${MACOS}" -eq 1 ] && [ ! -e "${PAWPAW_PREFIX}/include/qt5/QtCore" ]; then
+if [ "${MACOS}" -eq 1 ] && [ ! -e "${PAWPAW_PREFIX}/include/qt5/QtWidgets" ]; then
     ln -sfv ${PAWPAW_PREFIX}/lib/QtCore.framework/Headers ${PAWPAW_PREFIX}/include/qt5/QtCore
     ln -sfv ${PAWPAW_PREFIX}/lib/QtGui.framework/Headers ${PAWPAW_PREFIX}/include/qt5/QtGui
     ln -sfv ${PAWPAW_PREFIX}/lib/QtWidgets.framework/Headers ${PAWPAW_PREFIX}/include/qt5/QtWidgets

setup/versions.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 
+# ---------------------------------------------------------------------------------------------------------------------
 # base
+
 PKG_CONFIG_VERSION=0.28
 
+# ---------------------------------------------------------------------------------------------------------------------
 # common
+
 FLAC_VERSION=1.3.3
 FLUIDSYNTH_VERSION=1.1.11
 FFTW_VERSION=3.3.8
@@ -14,6 +18,10 @@ LIBOGG_VERSION=1.3.4
 LIBSAMPLERATE_VERSION=0.1.9
 LIBSNDFILE_VERSION=1.0.28
 LIBVORBIS_VERSION=1.3.7
+
+# ---------------------------------------------------------------------------------------------------------------------
+# plugins
+
 LILV_VERSION=0.24.10
 LV2_VERSION=1.18.0
 LV2LINT_VERSION=0.8.0
@@ -23,7 +31,18 @@ SORD_VERSION=0.16.6
 SRATOM_VERSION=0.6.6
 ZLIB_VERSION=1.2.11
 
+LV2LINT_SUPPORTED=1
+
+if [ "${MACOS_OLD}" -eq 1 ] || [ "${CROSS_COMPILING}" -eq 1 ]; then
+    LV2LINT_SUPPORTED=0
+fi
+if [ "${MACOS}" -eq 1 ] && [ "$(uname -r)" = "12.6.0" ]; then
+    LV2LINT_SUPPORTED=0
+fi
+
+# ---------------------------------------------------------------------------------------------------------------------
 # qt stuff
+
 if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
     QT5_VERSION=5.12.10
     QT5_MVERSION=5.12
@@ -32,7 +51,9 @@ else
     QT5_MVERSION=5.9
 fi
 
-# carla builds only
+# ---------------------------------------------------------------------------------------------------------------------
+# carla
+
 FILE_VERSION=5.34
 PYLIBLO_VERSION=0.9.2
 if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
@@ -52,10 +73,14 @@ else
     SIP_VERSION=4.19.13
 fi
 
-# jack builds only
+# ---------------------------------------------------------------------------------------------------------------------
+# jack
+
 AFTEN_VERSION=0.0.8
 DB_VERSION=5.3.28
 OPUS_VERSION=1.3.1
 PORTAUDIO_VERSION=19.6.0
 RTAUDIO_VERSION=e03448bd15c1c34e842459939d755f5f89e880ed
 TRE_VERSION=0.8.0
+
+# ---------------------------------------------------------------------------------------------------------------------