Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Pillow] pillow-wheels has been incorporated into Pillow (#11156) 

Two changes for the pillow project.

1. Pillow previously had a separate repository for wheel building
scripts - https://github.com/python-pillow/pillow-wheels

However, that has been incorporated into the main repository for
simplicity - https://github.com/python-pillow/Pillow/pull/7418

So this PR updates the project here to use the new location.

2. Pillow's oss-fuzz CI job is [currently failing because pip is too
old](https://github.com/python-pillow/Pillow/actions/runs/6666944851/job/18119459590#step:4:9947).
So this PR updates it.

cc @hugovk

---------

Co-authored-by: Andrew Murray <radarhere@users.noreply.github.com>
This commit is contained in:
Andrew Murray 2023-10-28 00:13:00 +11:00 committed by GitHub
parent 750c280885
commit dc24b109bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
projects/pillow/Dockerfile
View File

@ -24,7 +24,6 @@ RUN apt-get update && \
rsync rsync
RUN git clone --depth 1 https://github.com/python-pillow/Pillow RUN git clone --depth 1 https://github.com/python-pillow/Pillow
RUN git clone --depth 1 https://github.com/python-pillow/pillow-wheels
RUN $SRC/Pillow/Tests/oss-fuzz/build_dictionaries.sh RUN $SRC/Pillow/Tests/oss-fuzz/build_dictionaries.sh
@ -33,13 +32,15 @@ COPY build_depends.sh $SRC
RUN ln -s /usr/local/bin/python3 /usr/local/bin/python \ RUN ln -s /usr/local/bin/python3 /usr/local/bin/python \
&& ln -s /bin/true /usr/local/bin/yum_install \ && ln -s /bin/true /usr/local/bin/yum_install \
&& ln -s /bin/true /usr/local/bin/yum \ && ln -s /bin/true /usr/local/bin/yum \
&& cd $SRC/pillow-wheels \ && cd $SRC/Pillow \
&& git submodule update --init multibuild \ && git submodule update --init wheels/multibuild \
&& bash $SRC/build_depends.sh && bash $SRC/build_depends.sh
# install extra test images for a better starting corpus # install extra test images for a better starting corpus
RUN cd Pillow/depends && ./install_extra_test_images.sh RUN cd Pillow/depends && ./install_extra_test_images.sh
RUN python3 -m pip install --upgrade pip
COPY build.sh $SRC/ COPY build.sh $SRC/
# pillow optional runtime dependencies # pillow optional runtime dependencies

6
projects/pillow/build_depends.sh
View File

@ -15,7 +15,7 @@
# limitations under the License. # limitations under the License.
. multibuild/common_utils.sh . wheels/multibuild/common_utils.sh
export CONFIGURE_BUILD_SOURCED=1 export CONFIGURE_BUILD_SOURCED=1
BUILD_PREFIX="${BUILD_PREFIX:-/usr/local}" BUILD_PREFIX="${BUILD_PREFIX:-/usr/local}"
@ -23,7 +23,7 @@ export CPPFLAGS="-I$BUILD_PREFIX/include $CPPFLAGS"
export LIBRARY_PATH="$BUILD_PREFIX/lib:$LIBRARY_PATH" export LIBRARY_PATH="$BUILD_PREFIX/lib:$LIBRARY_PATH"
export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig/:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig/:$PKG_CONFIG_PATH"
. multibuild/library_builders.sh . wheels/multibuild/library_builders.sh
. config.sh . wheels/config.sh
pre_build pre_build