mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-06-30 18:03:07 +03:00
More tweaks from code review.
This commit is contained in:
parent
0e3eb70ea0
commit
54f23345d2
9
.github/workflows/wheels-dependencies.sh
vendored
9
.github/workflows/wheels-dependencies.sh
vendored
|
@ -19,14 +19,13 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
|
||||||
# Install them into `build/deps/darwin`
|
# Install them into `build/deps/darwin`
|
||||||
WORKDIR=$(pwd)/build/darwin
|
WORKDIR=$(pwd)/build/darwin
|
||||||
BUILD_PREFIX=$(pwd)/build/deps/darwin
|
BUILD_PREFIX=$(pwd)/build/deps/darwin
|
||||||
PLAT=$CIBW_ARCHS
|
|
||||||
else
|
else
|
||||||
# Build prefix will default to /usr/local
|
# Build prefix will default to /usr/local
|
||||||
WORKDIR=$(pwd)/build
|
WORKDIR=$(pwd)/build
|
||||||
PLAT=$CIBW_ARCHS
|
|
||||||
MB_ML_LIBC=${AUDITWHEEL_POLICY::9}
|
MB_ML_LIBC=${AUDITWHEEL_POLICY::9}
|
||||||
MB_ML_VER=${AUDITWHEEL_POLICY:9}
|
MB_ML_VER=${AUDITWHEEL_POLICY:9}
|
||||||
fi
|
fi
|
||||||
|
PLAT=$CIBW_ARCHS
|
||||||
|
|
||||||
# Define custom utilities
|
# Define custom utilities
|
||||||
source wheels/multibuild/common_utils.sh
|
source wheels/multibuild/common_utils.sh
|
||||||
|
@ -119,9 +118,9 @@ function build {
|
||||||
build_libjpeg_turbo
|
build_libjpeg_turbo
|
||||||
if [ -n "$IS_MACOS" ]; then
|
if [ -n "$IS_MACOS" ]; then
|
||||||
# Custom tiff build to include jpeg; by default, configure won't include
|
# Custom tiff build to include jpeg; by default, configure won't include
|
||||||
# headers/libs in the custom macOS prefix. Explicitly disable webp and
|
# headers/libs in the custom macOS prefix. Explicitly disable webp,
|
||||||
# zstd, because on x86_64 macs, it will pick up the Homebrew versions of
|
# libdeflate and zstd, because on x86_64 macs, it will pick up the
|
||||||
# webp and zstd from /usr/local.
|
# Homebrew versions of those libraries from /usr/local.
|
||||||
build_simple tiff $TIFF_VERSION https://download.osgeo.org/libtiff tar.gz \
|
build_simple tiff $TIFF_VERSION https://download.osgeo.org/libtiff tar.gz \
|
||||||
--with-jpeg-include-dir=$BUILD_PREFIX/include --with-jpeg-lib-dir=$BUILD_PREFIX/lib \
|
--with-jpeg-include-dir=$BUILD_PREFIX/include --with-jpeg-lib-dir=$BUILD_PREFIX/lib \
|
||||||
--disable-webp --disable-zstd --disable-libdeflate
|
--disable-webp --disable-zstd --disable-libdeflate
|
||||||
|
|
Loading…
Reference in New Issue
Block a user