#43 #82 libcurl troubleshooting, using manylinux 2014 by default

myselfhimself · Dec 4, 2020 · ebb11e8 · ebb11e8
1 parent 80b8e1d
commit ebb11e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/build_tools.bash b/build_tools.bash
@@ -216,11 +216,11 @@ function 33_build_manylinux () {
     # Default values allow for local running on a developer machine :)
     if [ -z "$DOCKER_IMAGE" ]
     then
-      DOCKER_IMAGE="quay.io/pypa/manylinux2010_x86_64"
+      DOCKER_IMAGE="quay.io/pypa/manylinux2014_x86_64"
     fi
     if [ -z "$PLAT" ]
     then
-      PLAT="manylinux2010_x86_64"
+      PLAT="manylinux2014_x86_64"
     fi
     if [ -z "$PRE_CMD" ]
     then

diff --git a/manylinux/build-wheels.sh b/manylinux/build-wheels.sh
@@ -9,24 +9,9 @@ PYBIN_PREFIX=${PYBIN_PREFIX:-cp3}
 
 # Install a system package required by our library
 yum check-update || { echo "yum check-update failed but manylinux build-wheels script will continue" ; }
-yum install fftw-devel curl-devel libpng-devel zlib-devel libgomp wget -y || { echo "Fatal yum dependencies install error" ; exit 1; }
+yum reinstall ca-certificates -y # prevent libcurl CA 77 certificate error
+yum install fftw-devel curl-devel openssl-devel nss-softokn-devel libcurl-devel libpng-devel zlib-devel libgomp libtiff-devel libjpeg-devel wget -y || { echo "Fatal yum dependencies install error" ; exit 1; }
 
-# # Install slightly newer libpng12 includes if too old, to avoid c++11 problem listed here: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676157
-# if [ "1.2.51" \> "$(yum info libpng-devel | grep Version | cut -d':' -f2 | awk '{print $1}' | uniq)" ]; then
-#     cd /tmp/
-#     ls -l
-#     curl -o libpng-1.2.51.tar.gz -s "https://master.dl.sourceforge.net/project/libpng/libpng12/older-releases/1.2.51/libpng-1.2.51.tar.gz?viasf=1"
-#     ls -l
-#     tar xzvf libpng*
-#     rm libpng*.tar.gz
-#     mv libpng* libpng12
-#     rm -rf /usr/include/libpng12
-#     mv libpng12 /usr/include/
-# fi
-
-# Allow building Pillow from source if needed (on old Centos builds)
-# Requirements inspired from Pillow's official Docker recipes at https://github.com/python-pillow/docker-images/blob/master/centos-6-amd64/Dockerfile
-yum install ghostscript libtiff-devel libjpeg-devel zlib-devel freetype-devel lcms2-devel libwebp-devel openjpeg2-devel tkinter tcl-devel tk-devel libffi-devel -y
 
 cd /io/