ARROW-7812: [Packaging][Python] Use LLVM 8 in manylinux1 wheels

Closes #6651 from kou/packaging-wheel-use-llvm-8 Lead-authored-by: Prudhvi Porandla <prudhvi.porandla@icloud.com> Co-authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
apache · Mar 18, 2020 · 2f952e6 · 2f952e6
1 parent f00a153
commit 2f952e6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/python/manylinux1/scripts/build_bison.sh b/python/manylinux1/scripts/build_bison.sh
@@ -19,7 +19,7 @@
 BISON_VERSION=3.3.2
 NCORES=$(($(grep -c ^processor /proc/cpuinfo) + 1))
 
-wget https://ftp.gnu.org/gnu/bison/bison-${BISON_VERSION}.tar.gz
+curl -sL https://ftp.gnu.org/gnu/bison/bison-${BISON_VERSION}.tar.gz -o bison-${BISON_VERSION}.tar.gz
 tar xf bison-${BISON_VERSION}.tar.gz
 pushd bison-${BISON_VERSION}
 ./configure --prefix=/usr

diff --git a/python/manylinux1/scripts/build_clang.sh b/python/manylinux1/scripts/build_clang.sh
@@ -18,8 +18,8 @@
 
 source /multibuild/manylinux_utils.sh
 
-export LLVM_VERSION="7.0.1"
-curl -sL https://releases.llvm.org/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.xz -o cfe-${LLVM_VERSION}.src.tar.xz
+export LLVM_VERSION="8.0.1"
+curl -sL https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.xz -o cfe-${LLVM_VERSION}.src.tar.xz
 unxz cfe-${LLVM_VERSION}.src.tar.xz
 tar xf cfe-${LLVM_VERSION}.src.tar
 pushd cfe-${LLVM_VERSION}.src
@@ -31,6 +31,7 @@ cmake  \
     -DCLANG_INCLUDE_DOCS=OFF \
     -DLLVM_INCLUDE_TESTS=OFF \
     -DLLVM_INCLUDE_DOCS=OFF \
+    -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
     -GNinja \
     ..
 ninja -w dupbuild=warn install # both clang and llvm builds generate llvm-config file

diff --git a/python/manylinux1/scripts/build_llvm.sh b/python/manylinux1/scripts/build_llvm.sh
@@ -18,8 +18,8 @@
 
 source /multibuild/manylinux_utils.sh
 
-export LLVM_VERSION="7.0.1"
-curl -sL https://releases.llvm.org/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz -o llvm-${LLVM_VERSION}.src.tar.xz
+export LLVM_VERSION="8.0.1"
+curl -sL https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz -o llvm-${LLVM_VERSION}.src.tar.xz
 unxz llvm-${LLVM_VERSION}.src.tar.xz
 tar xf llvm-${LLVM_VERSION}.src.tar
 pushd llvm-${LLVM_VERSION}.src
@@ -37,6 +37,7 @@ cmake -DCMAKE_INSTALL_PREFIX=$PREFIX \
     -DLLVM_ENABLE_RTTI=ON \
     -DLLVM_ENABLE_OCAMLDOC=OFF \
     -DLLVM_USE_INTEL_JITEVENTS=ON \
+    -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
     -DPYTHON_EXECUTABLE="$(cpython_path 3.6)/bin/python" \
     -GNinja \
     ..

diff --git a/python/manylinux1/scripts/build_thrift.sh b/python/manylinux1/scripts/build_thrift.sh
@@ -17,7 +17,10 @@
 # under the License.
 
 export THRIFT_VERSION=0.12.0
-wget https://archive.apache.org/dist/thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz
+THRIFT_DOWNLOAD_PATH=thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz
+curl -sL \
+  "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=${THRIFT_DOWNLOAD_PATH}" \
+  -o thrift-${THRIFT_VERSION}.tar.gz
 tar xf thrift-${THRIFT_VERSION}.tar.gz
 pushd thrift-${THRIFT_VERSION}
 mkdir build-tmp

diff --git a/python/manylinux1/scripts/install_cmake.sh b/python/manylinux1/scripts/install_cmake.sh
@@ -17,9 +17,9 @@
 # under the License.
 
 # pip tries to install 3.16.3 but there is no wheel for this version yet so it tries to 
-# build from source and fails. 
+# build from source and fails.
 # Pinning to 3.13.3 to avoid building cmake from source
-export CMAKE_VERSION=3.13.3 
+export CMAKE_VERSION=3.13.3
 /opt/python/cp37-cp37m/bin/pip install cmake==${CMAKE_VERSION} ninja
 ln -s /opt/python/cp37-cp37m/bin/cmake /usr/bin/cmake
 ln -s /opt/python/cp37-cp37m/bin/ninja /usr/bin/ninja