Make updates needed for mac 14 arm64

pygame-community · Apr 20, 2024 · d970232 · d970232
1 parent 5342885
commit d970232
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/buildconfig/macdependencies/clean_usr_local.sh b/buildconfig/macdependencies/clean_usr_local.sh
@@ -4,14 +4,13 @@
 # First clean up some homebrew stuff we don't want linked in
 # ----------------------------------------------------------
 
-rm -rf /usr/local/bin/curl
-rm -rf /usr/local/opt/curl
-rm -rf /usr/local/bin/git
-rm -rf /usr/local/opt/git
+rm -rf /usr/local/bin/curl /usr/local/opt/curl /opt/homebrew/bin/curl
+rm -rf /usr/local/bin/git /usr/local/opt/git /opt/homebrew/bin/git
 # Use the apple provided curl, and git.
 #     The homebrew ones depend on libs we don't want to include.
 # ln -s /usr/bin/curl /usr/local/bin/curl
 ln -s /usr/bin/git /usr/local/bin/git
+ln -s /usr/bin/git /opt/homebrew/bin/git
 
 rm -rf /usr/local/lib/libtiff*
 rm -rf /usr/local/lib/libzstd*
@@ -23,16 +22,17 @@ rm -rf /usr/local/lib/libgthread*
 rm -rf /usr/local/lib/libintl*
 rm -rf /usr/local/lib/libbrotlidec*
 rm -rf /usr/local/lib/libopus*
-rm -rf /usr/local/opt/freetype
+rm -rf /usr/local/lib/freetype*
+rm -rf /usr/local/opt/freetype*
 
-rm -rf /usr/local/Cellar/libtiff
-rm -rf /usr/local/Cellar/libsndfile
-rm -rf /usr/local/Cellar/glib
-rm -rf /usr/local/Cellar/brotli
-rm -rf /usr/local/Cellar/pcre*
-rm -rf /usr/local/Cellar/opusfile
-rm -rf /usr/local/Cellar/opus
-rm -rf /usr/local/Cellar/freetype
+rm -rf /usr/local/Cellar/libtiff /opt/homebrew/Cellar/libtiff
+rm -rf /usr/local/Cellar/libsndfile /opt/homebrew/Cellar/libsndfile
+rm -rf /usr/local/Cellar/glib /opt/homebrew/Cellar/glib
+rm -rf /usr/local/Cellar/brotli /opt/homebrew/Cellar/brotli
+rm -rf /usr/local/Cellar/pcre* /opt/homebrew/Cellar/pcre*
+rm -rf /usr/local/Cellar/opusfile /opt/homebrew/Cellar/opusfile
+rm -rf /usr/local/Cellar/opus /opt/homebrew/Cellar/opus
+rm -rf /usr/local/Cellar/freetype* /opt/homebrew/Cellar/freetype*
 
 rm -rf /usr/local/share/doc/tiff-*
 rm -rf /usr/local/share/doc/libsndfile

diff --git a/buildconfig/manylinux-build/docker_base/buildtools/install.sh b/buildconfig/manylinux-build/docker_base/buildtools/install.sh
@@ -10,11 +10,14 @@ cd $(dirname `readlink -f "$0"`)
 # separate build script for it
 
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    export PG_LINUX_EXTRA_FLAGS="--user"
+    export PG_PIP_EXTRA_FLAGS="--user"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+    # We don't need fluidsynth framework on mac builds
+    export PG_PIP_EXTRA_FLAGS="--break-system-packages"
 fi
 
 # pin versions for stability (remember to keep updated)
-python3 -m pip install $PG_LINUX_EXTRA_FLAGS \
+python3 -m pip install $PG_PIP_EXTRA_FLAGS \
     setuptools==68.2.2 cmake==3.27.6 meson==1.2.2 ninja==1.11.1
 
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then

diff --git a/buildconfig/manylinux-build/docker_base/glib/build-glib.sh b/buildconfig/manylinux-build/docker_base/glib/build-glib.sh
@@ -15,7 +15,7 @@ tar xf ${GLIB}.tar
 cd $GLIB
 
 # a minimal glib install will do for us
-meson setup _build $PG_BASE_MESON_FLAGS -Dtests=false \
+meson setup _build $PG_BASE_MESON_FLAGS --force-fallback-for libpcre2-8 -Dtests=false \
     -Dselinux=disabled -Dlibmount=disabled -Ddtrace=false -Dsystemtap=false -Dnls=disabled
 
 meson compile -C _build