Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .github/workflows/wheels-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,6 @@ function build_brotli {
touch brotli-stamp
}

function build_freetype { # overrides multibuild's function so we can add "$@" args
build_libpng
build_bzip2
build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz "$@"
}

function build_harfbuzz {
if [ -e harfbuzz-stamp ]; then return; fi
python3 -m pip install meson ninja
Expand Down Expand Up @@ -313,7 +307,7 @@ function build {
# FreeType and HarfBuzz each want the other:
# HarfBuzz reads font data through FreeType, and FreeType's autofitter asks HarfBuzz which glyphs a script covers.
# Break the cycle by building FreeType twice, so that the FreeType we ship is linked against the HarfBuzz we ship.
build_freetype --with-harfbuzz=no
build_freetype

if [[ -z "$IOS_SDK" ]]; then
# On iOS, there's no vendor-provided raqm, and we can't ship it due to
Expand All @@ -322,7 +316,7 @@ function build {

# Now that HarfBuzz exists, build FreeType again against it.
rm -rf freetype-$FREETYPE_VERSION freetype-stamp
build_freetype --with-harfbuzz=yes
CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ" build_freetype
fi
}

Expand Down
Loading