From d702314fb04a5f5061a2a205fc8ef536a8a36d63 Mon Sep 17 00:00:00 2001 From: Theodore Kisner Date: Tue, 14 May 2024 05:44:25 -0700 Subject: [PATCH] More attempts to fix libflac compilation for macos wheels --- packaging/deps/libflac.sh | 1 + packaging/wheels/install_deps_osx.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/packaging/deps/libflac.sh b/packaging/deps/libflac.sh index 88e3a9f9c..fb79aaec2 100644 --- a/packaging/deps/libflac.sh +++ b/packaging/deps/libflac.sh @@ -40,6 +40,7 @@ tar xzf ${flac_pkg} \ -DBUILD_UTILS=OFF \ -DBUILD_TESTING=OFF \ -DBUILD_EXAMPLES=OFF \ + -DBUILD_SHARED_LIBS=ON \ -DINSTALL_MANPAGES=OFF \ -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ .. \ diff --git a/packaging/wheels/install_deps_osx.sh b/packaging/wheels/install_deps_osx.sh index ae103d20d..59bc00903 100755 --- a/packaging/wheels/install_deps_osx.sh +++ b/packaging/wheels/install_deps_osx.sh @@ -69,7 +69,11 @@ else fi # Install any pre-built dependencies with homebrew + brew install cmake +# Force uninstall flac tools, to avoid conflicts with our +# custom compiled version. +brew uninstall -f flac libogg if [ "x${use_gcc}" = "xyes" ]; then brew install gcc@${gcc_version} fi