From 5e0af242224cbd24c88cf20d65711d2847aab0e0 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Mon, 17 Jan 2022 09:15:32 +0000
Subject: [PATCH] Fix build

---
 bootstrap-carla.sh  | 8 +-------
 bootstrap-common.sh | 4 ++--
 setup/versions.sh   | 4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/bootstrap-carla.sh b/bootstrap-carla.sh
index a1b3e7c..6ad3f08 100755
--- a/bootstrap-carla.sh
+++ b/bootstrap-carla.sh
@@ -345,7 +345,7 @@ fi
 # importlib_metadata (optional)
 
 if [ -n "${IMPORTLIB_METADATA_VERSION}" ]; then
-    download importlib_metadata "${IMPORTLIB_METADATA_VERSION}" "https://files.pythonhosted.org/packages/3f/a8/16dc098b0addd1c20719c18a86e985be851b3ec1e103e703297169bb22cc"
+    download importlib_metadata "${IMPORTLIB_METADATA_VERSION}" "https://files.pythonhosted.org/packages/f8/41/8ffb059708359ea14a3ec74a99a2bf0cd44a0c983a0c480d9eb7a69438bb"
     build_python importlib_metadata "${IMPORTLIB_METADATA_VERSION}"
 fi
 
@@ -354,12 +354,6 @@ fi
 
 git_clone cx_Freeze "${CXFREEZE_VERSION}" "https://github.com/anthony-tuininga/cx_Freeze.git"
 
-if [ "${CXFREEZE_VERSION}" = "e1c33afea842bc61dac82145a8a0be5fbd318a92" ]; then
-    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//'
-    # FIXME
-    exit 0
-fi
 if [ "${WIN32}" -eq 1 ]; then
     export PYTHONPATH="${PAWPAW_PREFIX}/lib/python3.8/site-packages"
 fi
diff --git a/bootstrap-common.sh b/bootstrap-common.sh
index dfc8836..21a50b5 100755
--- a/bootstrap-common.sh
+++ b/bootstrap-common.sh
@@ -119,7 +119,7 @@ download libogg "${LIBOGG_VERSION}" "${LIBOGG_URL}"
 build_autoconf libogg "${LIBOGG_VERSION}"
 
 if [ "${CROSS_COMPILING}" -eq 0 ]; then
-    run_make libogg "${LIBOGG_VERSION}" check
+    run_make libogg "${LIBOGG_VERSION}" "check -j 1"
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -131,7 +131,7 @@ download libvorbis "${LIBVORBIS_VERSION}" "${LIBVORBIS_URL}"
 build_autoconf libvorbis "${LIBVORBIS_VERSION}" "${LIBVORBIS_EXTRAFLAGS}"
 
 if [ "${CROSS_COMPILING}" -eq 0 ]; then
-    run_make libvorbis "${LIBVORBIS_VERSION}" check
+    run_make libvorbis "${LIBVORBIS_VERSION}" "check -j 1"
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------
diff --git a/setup/versions.sh b/setup/versions.sh
index f633656..b079fc5 100644
--- a/setup/versions.sh
+++ b/setup/versions.sh
@@ -129,7 +129,7 @@ FILE_VERSION=5.34
 FILE_URL=ftp://ftp.astron.com/pub/file
 
 if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
-    CXFREEZE_VERSION=e1c33afea842bc61dac82145a8a0be5fbd318a92 # 6.4.2
+    CXFREEZE_VERSION=a59a0f6c476554c1a789de2a9f6f77329d6a6dd1 # 6.8.4
     PYTHON_VERSION=3.9.5
     PYLIBLO_VERSION=0.10.0
     PYQT5_VERSION=5.13.1
@@ -137,7 +137,7 @@ if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
     # extra, needed for pyliblo
     CYTHON_VERSION=0.29.21
     # extra, needed for cxfreeze
-    IMPORTLIB_METADATA_VERSION=3.1.1
+    IMPORTLIB_METADATA_VERSION=4.10.1
     SETUPTOOLS_SCM_VERSION=5.0.0
     TOML_VERSION=0.10.2
     ZIPP_VERSION=3.4.0