Final fixup for carla, speed up macos builds

bootstrap-carla.sh

@@ -107,6 +107,12 @@ build_pyqt PyQt5_gpl "${PYQT5_VERSION}" "--concatenate --confirm-license -c"
 download pyliblo "${PYLIBLO_VERSION}" "http://das.nasophon.de/download"
 build_python pyliblo "${PYLIBLO_VERSION}"
 
+# ---------------------------------------------------------------------------------------------------------------------
+# setuptools_scm
+
+download setuptools_scm "${SETUPTOOLS_SCM_VERSION}" "https://files.pythonhosted.org/packages/ed/b6/979bfa7b81878b2b4475dde092aac517e7f25dd33661796ec35664907b31"
+build_python setuptools_scm "${SETUPTOOLS_SCM_VERSION}"
+
 # ---------------------------------------------------------------------------------------------------------------------
 # toml
 
@@ -128,7 +134,7 @@ build_python importlib_metadata "${IMPORTLIB_METADATA_VERSION}"
 # ---------------------------------------------------------------------------------------------------------------------
 # cxfreeze
 
-download cx_Freeze "${CXFREEZE_VERSION}" "https://github.com/anthony-tuininga/cx_Freeze/archive"
+download cx_Freeze "${CXFREEZE_VERSION}" "https://github.com/anthony-tuininga/cx_Freeze/archive" "" "nv"
 patch_file cx_Freeze "${CXFREEZE_VERSION}" "setup.py" 's/"python%s.%s"/"python%s.%sm"/'
 patch_file cx_Freeze "${CXFREEZE_VERSION}" "setup.py" 's/extra_postargs=extraArgs,/extra_postargs=extraArgs+os.getenv("LDFLAGS").split(),/'
 patch_file cx_Freeze "${CXFREEZE_VERSION}" "cx_Freeze/macdist.py" 's/, use_builtin_types=False//'

setup/env.sh

@@ -125,6 +125,9 @@ WAF_ARGS=""
 if which nproc > /dev/null; then
     MAKE_ARGS+="-j $(nproc)"
     WAF_ARGS+="-j $(nproc)"
+elif [ "${MACOS}" -eq 1 ]; then
+    MAKE_ARGS+="-j $(sysctl -n hw.logicalcpu)"
+    WAF_ARGS+="-j $(sysctl -n hw.logicalcpu)"
 fi
 
 if [ "${CROSS_COMPILING}" -eq 1 ]; then

setup/functions.sh

@@ -28,7 +28,11 @@ function download() {
         else
             local dlurl
             if echo ${dlbaseurl} | grep -q github.com; then
-                dlurl="${dlbaseurl}/v${version}.${dlext}"
+                if [ x"${dlmethod}" = x"nv" ]; then
+                    dlurl="${dlbaseurl}/${version}.${dlext}"
+                else
+                    dlurl="${dlbaseurl}/v${version}.${dlext}"
+                fi
             elif [ "${dlext}" = "orig.tar.gz" ]; then
                 dlurl="${dlbaseurl}/${name}_${version}.${dlext}"
             else
@@ -352,6 +356,8 @@ function build_python() {
 
     _prebuild "${name}" "${pkgdir}"
 
+    touch "${pkgdir}/.stamp_configured"
+
     if [ ! -f "${pkgdir}/.stamp_built" ]; then
         pushd "${pkgdir}"
         ${python} setup.py build ${extraconfrules}

setup/versions.sh

@@ -34,6 +34,7 @@ fi
 
 # carla builds only
 FILE_VERSION=5.34
+PYLIBLO_VERSION=0.9.2
 if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
     CXFREEZE_VERSION=6.4.2
     PYTHON_VERSION=3.9.1