From 2e6621feb1298994442fc1a082a1facb6b9d2d53 Mon Sep 17 00:00:00 2001 From: Frankie Dintino Date: Tue, 4 Mar 2025 10:37:38 -0500 Subject: [PATCH] fixup --- wheelbuild/config.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/wheelbuild/config.sh b/wheelbuild/config.sh index c3ed4a4..02566fc 100644 --- a/wheelbuild/config.sh +++ b/wheelbuild/config.sh @@ -176,9 +176,15 @@ function install_meson { install_ninja group_start "Install meson" + if [ -n "$IS_MACOS" ] && [ "$MB_PYTHON_VERSION" == "2.7" ]; then - /opt/homebrew/bin/brew install meson - sudo ln -s /opt/homebrew/bin/meson /usr/local/bin + if [[ "$(uname -m)" == "x86_64" ]]; then + HOMEBREW_PREFIX=/usr/local + else + HOMEBREW_PREFIX=/opt/homebrew + fi + $HOMEBREW_PREFIX/bin/brew install meson + sudo ln -s $HOMEBREW_PREFIX/bin/meson /usr/local/bin elif [ "$MB_PYTHON_VERSION" == "2.7" ]; then local python39_exe=$(cpython_path 3.9)/bin/python $python39_exe -m pip install meson @@ -247,6 +253,11 @@ function build_rav1e { function build_libavif { LIBAVIF_CMAKE_FLAGS=() + if [ -n "$IS_MACOS" ]; then + for pkg in webp jpeg-xl aom composer gd imagemagick libavif libheif php; do + brew remove --ignore-dependencies $pkg ||: + done + fi which cmake cmake --version if [ -n "$IS_MACOS" ] && [ "$PLAT" == "arm64" ]; then