From 89d1d3c3cf3181c237c82127e22d5a05b5d3add5 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 27 Oct 2023 23:30:07 +1100 Subject: [PATCH 1/2] [pillow] pillow-wheels has been incorporated into Pillow --- projects/pillow/Dockerfile | 5 ++--- projects/pillow/build_depends.sh | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/projects/pillow/Dockerfile b/projects/pillow/Dockerfile index c65e70363ada..8a70282493c7 100644 --- a/projects/pillow/Dockerfile +++ b/projects/pillow/Dockerfile @@ -24,7 +24,6 @@ RUN apt-get update && \ rsync 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 @@ -33,8 +32,8 @@ COPY build_depends.sh $SRC 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 \ - && cd $SRC/pillow-wheels \ - && git submodule update --init multibuild \ + && cd $SRC/Pillow \ + && git submodule update --init wheels/multibuild \ && bash $SRC/build_depends.sh # install extra test images for a better starting corpus diff --git a/projects/pillow/build_depends.sh b/projects/pillow/build_depends.sh index efdb34eee475..b0b2c8752852 100644 --- a/projects/pillow/build_depends.sh +++ b/projects/pillow/build_depends.sh @@ -15,7 +15,7 @@ # limitations under the License. -. multibuild/common_utils.sh +. wheels/multibuild/common_utils.sh export CONFIGURE_BUILD_SOURCED=1 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 PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig/:$PKG_CONFIG_PATH" -. multibuild/library_builders.sh -. config.sh +. wheels/multibuild/library_builders.sh +. wheels/config.sh pre_build From 0b7f79ca9d26497fa43f1c2c832546e9e46dd8f0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 27 Oct 2023 23:30:26 +1100 Subject: [PATCH 2/2] [pillow] Upgrade pip --- projects/pillow/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/pillow/Dockerfile b/projects/pillow/Dockerfile index 8a70282493c7..b5330f88508c 100644 --- a/projects/pillow/Dockerfile +++ b/projects/pillow/Dockerfile @@ -39,6 +39,8 @@ RUN ln -s /usr/local/bin/python3 /usr/local/bin/python \ # install extra test images for a better starting corpus RUN cd Pillow/depends && ./install_extra_test_images.sh +RUN python3 -m pip install --upgrade pip + COPY build.sh $SRC/ # pillow optional runtime dependencies