Merge pull request #8421 from radarhere/harfbuzz

python-pillow · Sep 27, 2024 · 86b42a9 · 86b42a9
2 parents 485a062 + fb8db83
commit 86b42a9
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
@@ -16,7 +16,7 @@ ARCHIVE_SDIR=pillow-depends-main
 
 # Package versions for fresh source builds
 FREETYPE_VERSION=2.13.2
-if [[ "$MB_ML_VER" != 2014 ]]; then
+if [[ -n "$IS_MACOS" ]] || ([[ "$MB_ML_VER" != 2014 ]] && [[ -z "$SANITIZER" ]]); then
     HARFBUZZ_VERSION=10.0.1
 else
     HARFBUZZ_VERSION=8.5.0
@@ -156,12 +156,10 @@ if [[ -n "$IS_MACOS" ]]; then
   fi
 
   brew install meson pkg-config
-elif [[ "$MB_ML_LIBC" == "manylinux" ]]; then
-  if [[ "$HARFBUZZ_VERSION" != 8.5.0 ]]; then
-    yum install -y meson
-  fi
-else
+elif [[ -n "$IS_ALPINE" ]]; then
   apk add meson
+elif [[ "$HARFBUZZ_VERSION" != 8.5.0 ]]; then
+  yum install -y meson
 fi
 
 wrap_wheel_builder build