python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-13 18:56:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Linux config by correcting a logic error in macOS config.

Browse Source
This commit is contained in:
Russell Keith-Magee 2024-10-29 09:25:47 +08:00
parent c74a5bdd85
commit 72d81e24a8
No known key found for this signature in database
GPG Key ID: 3D2DAB6A37BB5BC3
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/wheels-dependencies.sh vendored
View File

@ -4,8 +4,8 @@
if [ -z "$IS_MACOS" ]; then if [ -z "$IS_MACOS" ]; then
export MB_ML_LIBC=${AUDITWHEEL_POLICY::9} export MB_ML_LIBC=${AUDITWHEEL_POLICY::9}
export MB_ML_VER=${AUDITWHEEL_POLICY:9} export MB_ML_VER=${AUDITWHEEL_POLICY:9}
else
# Build and install into the `build/deps` folder. # Build and install macOS builds into the `build/deps` folder.
BUILD_PREFIX=$(pwd)/build/deps BUILD_PREFIX=$(pwd)/build/deps
fi fi
export PLAT=$CIBW_ARCHS export PLAT=$CIBW_ARCHS
@ -166,9 +166,6 @@ if [[ -n "$IS_MACOS" ]]; then
build_pkg_config build_pkg_config
# Ensure cmake is available # Ensure cmake is available
python3 -m pip install cmake python3 -m pip install cmake
else
# Ensure that any built libraries are on the linker path.
export LD_LIBRARY_PATH=$BUILD_PREFIX/lib
fi fi
wrap_wheel_builder build wrap_wheel_builder build

4
pyproject.toml
View File

@ -104,10 +104,6 @@ test-extras = "tests"
[tool.cibuildwheel.macos.environment] [tool.cibuildwheel.macos.environment]
PATH = "$(pwd)/build/deps/bin:$(dirname $(which python3)):/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin" PATH = "$(pwd)/build/deps/bin:$(dirname $(which python3)):/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin"
[tool.cibuildwheel.linux.environment]
LD_LIBRARY_PATH = "$(pwd)/build/deps/lib"
PKG_CONFIG_PATH = "$(pwd)/build/deps/lib/pkgconfig:$(pwd)/build/deps/share/pkgconfig"
[tool.black] [tool.black]
exclude = "wheels/multibuild" exclude = "wheels/multibuild"