From df9e68603ca7d51e85f926718673e2e4901fb0d4 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Mon, 27 Nov 2023 20:09:47 +1100 Subject: [PATCH] pillow: Updated script path (#11267) pillow has started using [cibuildwheel](https://github.com/pypa/cibuildwheel) - https://github.com/python-pillow/Pillow/pull/7552 This moved the script for building wheel dependencies from `wheels/config.sh`, a more natural location for [multibuild](https://github.com/multi-build/multibuild), to just under GitHub Actions instead, at [.github/workflows/wheel-dependencies.sh](https://github.com/python-pillow/Pillow/blob/main/.github/workflows/wheels-dependencies.sh) It also now includes `wheels/multibuild/library_builders.sh` [by itself](https://github.com/python-pillow/Pillow/blob/e2ddd27500cdd4c8156bc0d5fe0bfa050408c707/.github/workflows/wheels-dependencies.sh#L10), and rearranged the code to run immediately, instead of needing `pre_build` to be called separately. cc @hugovk Co-authored-by: Andrew Murray --- projects/pillow/build_depends.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/projects/pillow/build_depends.sh b/projects/pillow/build_depends.sh index b0b2c8752..adfb9df2b 100644 --- a/projects/pillow/build_depends.sh +++ b/projects/pillow/build_depends.sh @@ -23,7 +23,4 @@ export CPPFLAGS="-I$BUILD_PREFIX/include $CPPFLAGS" export LIBRARY_PATH="$BUILD_PREFIX/lib:$LIBRARY_PATH" export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig/:$PKG_CONFIG_PATH" -. wheels/multibuild/library_builders.sh -. wheels/config.sh - -pre_build +. .github/workflows/wheels-dependencies.sh