Merge pull request #614 from esc/fix/wheel_build

Fix wheel building.

.travis.yml

@@ -1,4 +1,4 @@
-# TravisCI is testing manylinux1 wheels only.
+# TravisCI is testing manylinux2010 wheels only.
 # Azure is used to test the Anaconda compiler toolchina.
 #
 # Reference:
@@ -20,11 +20,11 @@ jobs:
     - env: PYVER=cp38-cp38   ARCH=x32
 
 install:
-    - if [ "$ARCH" == "x64" ]; then DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64; else DOCKER_IMAGE=quay.io/pypa/manylinux1_i686; fi
+    - if [ "$ARCH" == "x64" ]; then DOCKER_IMAGE=quay.io/pypa/manylinux2010_x86_64; else DOCKER_IMAGE=quay.io/pypa/manylinux2010_i686; fi
     - docker pull $DOCKER_IMAGE
 
 script:
-    - ./buildscripts/manylinux1/docker_run_$ARCH.sh build_llvmlite.sh $PYVER
+    - ./buildscripts/manylinux2010/docker_run_$ARCH.sh build_llvmlite.sh $PYVER
 
 notifications:
     email: false

buildscripts/manylinux1/README.md → buildscripts/manylinux2010/README.md

@@ -1,28 +1,28 @@
-# README: Building ManyLinux1 Wheels
+# README: Building ManyLinux2010 Wheels
 
 
-## Build llvmdev packages for manylinux1
+## Build llvmdev packages for manylinux2010
 
 Run the script below to start docker off building `llvmdev` base from the current state of the source tree:
 
-- 32-bit linux: `./buildscripts/manylinux1/docker_run_x32.sh build_llvmdev.sh`
-- 64-bit linux: `./buildscripts/manylinux1/docker_run_x64.sh build_llvmdev.sh`
+- 32-bit linux: `./buildscripts/manylinux2010/docker_run_x32.sh build_llvmdev.sh`
+- 64-bit linux: `./buildscripts/manylinux2010/docker_run_x64.sh build_llvmdev.sh`
 
 The conda packages will be stored into `<llvmlite_source_root>/docker_output`
 
 Note: the `docker_output` location can be used as a local conda channel.
 
-Finally, upload the conda package to the numba channel under the "manylinux1" label:
+Finally, upload the conda package to the numba channel under the "manylinux2010" label:
 
-`anaconda upload -u numba -l manylinux1 <filepath>`
+`anaconda upload -u numba -l manylinux2010 <filepath>`
 
 
-## Build llvmlite wheel for manylinux1
+## Build llvmlite wheel for manylinux2010
 
 Run the script below to start docker off building `llvmlite` base from the current state of the source tree:
 
-- 32-bit linux: `./buildscripts/manylinux1/docker_run_x32.sh build_llvmlite.sh <pyver>`
-- 64-bit linux: `./buildscripts/manylinux1/docker_run_x64.sh build_llvmlite.sh <pyver>`
+- 32-bit linux: `./buildscripts/manylinux2010/docker_run_x32.sh build_llvmlite.sh <pyver>`
+- 64-bit linux: `./buildscripts/manylinux2010/docker_run_x64.sh build_llvmlite.sh <pyver>`
 
 The conda packages will be stored into `<llvmlite_source_root>/docker_output/dist_<arch>_<pyver>`
 

buildscripts/manylinux2010/build_llvmdev.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cd $(dirname $0)
+source ./prepare_miniconda.sh $1
+
+conda build /root/llvmlite/conda-recipes/llvmdev_manylinux2010 --output-folder=/root/llvmlite/docker_output

buildscripts/manylinux1/build_llvmlite.sh → buildscripts/manylinux2010/build_llvmlite.sh

@@ -19,7 +19,7 @@ ls -l /opt/python/$pyver/bin
 conda create -y -n $envname
 source activate $envname
 # Install llvmdev
-conda install -y -c numba/label/manylinux1 llvmdev
+conda install -y -c numba/label/manylinux2010 llvmdev
 
 # Prepend builtin Python Path
 export PATH=/opt/python/$pyver/bin:$PATH

buildscripts/manylinux1/configure_conda.sh → buildscripts/manylinux2010/configure_conda.sh

@@ -1,4 +1,4 @@
-# Setup miniconda environment that is compatible with manylinux1 docker image
+# Setup miniconda environment that is compatible with manylinux2010 docker image
 conda install -y conda=4.3.25 conda-build=3.0.9 anaconda-client
 # Pin conda and conda-build versions that are known to be compatible
 echo "conda ==4.3.25" >> /root/miniconda3/conda-meta/pinned

buildscripts/manylinux1/docker_run.sh → buildscripts/manylinux2010/docker_run.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
-# Use this to make the llvmdev packages that are manylinux1 compatible
+# Use this to make the llvmdev packages that are manylinux2010 compatible
 srcdir=$( cd "$(dirname $0)/../.."  && pwd )
 echo "srcdir=$srcdir"
 
 echo "MINICONDA_FILE=$MINICONDA_FILE"
-docker run --rm -v $srcdir:/root/llvmlite quay.io/pypa/manylinux1_${ARCH} ${PRECMD} /root/llvmlite/buildscripts/manylinux1/$1 ${MINICONDA_FILE} $2
+docker run --rm -v $srcdir:/root/llvmlite quay.io/pypa/manylinux2010_${ARCH} ${PRECMD} /root/llvmlite/buildscripts/manylinux2010/$1 ${MINICONDA_FILE} $2
 

buildscripts/manylinux1/prepare_miniconda.sh → buildscripts/manylinux2010/prepare_miniconda.sh

@@ -5,5 +5,5 @@ curl https://repo.anaconda.com/miniconda/$1 > mini3.sh
 bash mini3.sh -b -f
 source /root/miniconda3/bin/activate root
 
-cd /root/llvmlite/buildscripts/manylinux1
+cd /root/llvmlite/buildscripts/manylinux2010
 ./configure_conda.sh

conda-recipes/llvmdev_manylinux1/meta.yaml → conda-recipes/llvmdev_manylinux2010/meta.yaml

@@ -46,7 +46,6 @@ source:
     - ../intel-D47188-svml-VF.patch
     - ../expect-fastmath-entrypoints-in-add-TLI-mappings.ll.patch
     {% endif %}
-    - ../expect-fastmath-entrypoints-in-add-TLI-mappings.ll.patch
     # Reverts a patch limiting non-GlobalValue name length
     - ../0001-Revert-Limit-size-of-non-GlobalValue-name.patch
 
@@ -57,7 +56,7 @@ source:
 
 build:
   number: {{ build_number }}
-  string: "manylinux1h{{ PKG_HASH }}"
+  string: "manylinux2010h{{ PKG_HASH }}"
   script_env:
     - CFLAGS
     - CXXFLAGS