Merge pull request python-pillow#126 from radarhere/fixes

radarhere · Dec 29, 2021 · a1ef11b · a1ef11b
2 parents 3fbaa32 + 8158c07
commit a1ef11b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/arch/Dockerfile b/arch/Dockerfile
@@ -7,6 +7,8 @@ RUN pacman -Syu --noconfirm \
             wget \
     && find /var/cache/pacman/ -type f -delete
 
+RUN pacman -Sy --noconfirm --overwrite "*libedit*,*readline.h,*histedit.h" libedit
+
 RUN pacman -Sy --noconfirm \
             extra/freetype2 \
             extra/fribidi \

diff --git a/manylinux2014-wheel-build/Dockerfile b/manylinux2014-wheel-build/Dockerfile
@@ -2,7 +2,7 @@ FROM quay.io/pypa/manylinux2014_x86_64:latest
 
 run mkdir /src && mkdir /Pillow
 ENV SRC=/src
-ENV PATH=/opt/rh/devtoolset-2/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV PATH=/opt/rh/devtoolset-9/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN git clone --depth 1 https://github.com/python-pillow/pillow-wheels /src/pillow-wheels
 

diff --git a/manylinux2014-wheel-build/build_depends.sh b/manylinux2014-wheel-build/build_depends.sh
@@ -26,5 +26,5 @@ export PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig/:$PKG_CONFIG_PATH"
 . multibuild/library_builders.sh
 . config.sh
 
-yum install -y gcc gcc-c++
+yum install -y devtoolset-9-gcc devtoolset-9-gcc-c++
 pre_build