Do not attempt to install cmake if it is already present #8593
+1
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DavidKorczynski
pushed a commit
to google/oss-fuzz
that referenced
this pull request
Jan 4, 2025
https://github.com/google/oss-fuzz/blob/2ef5c1fd8bb77f86866069ddf063e9b0efcc7256/projects/pillow/Dockerfile#L32-L33 These lines can be removed. Pillow no longer needs to suppress errors when calling yum. They would have been there originally because - multibuild called `yum_install` for installing [zlib](https://github.com/multi-build/multibuild/blob/42d761728d141d8462cd9943f4329f12fe62b155/library_builders.sh#L144) and [`cmake`](https://github.com/multi-build/multibuild/blob/42d761728d141d8462cd9943f4329f12fe62b155/library_builders.sh#L217), but python-pillow/pillow-wheels#204 and python-pillow/Pillow#8593 mean that those are used anymore. - Pillow called `yum` to remove zlib-devel, but that is no longer the case after python-pillow/Pillow#8658 cc @hugovk Co-authored-by: Andrew Murray <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates multibuild to include multi-build/multibuild#542, so that if
cmakeis already available, the multibuildget_modern_cmakefunction does not attempt to install it whenbuild_openjpegorbuild_libjpeg_turbois called.The cmake install attempt on macOS uses brew, so this removes lines from the macOS wheel build like https://github.com/python-pillow/Pillow/actions/runs/12268369479/job/34230079347#step:5:4042