llvm 8 changes for docker image

pprudhvi · Feb 5, 2020 · 701f286 · 701f286
1 parent cc4dd38
commit 701f286
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/python/manylinux1/Dockerfile-x86_64_base b/python/manylinux1/Dockerfile-x86_64_base
@@ -17,7 +17,7 @@
 
 # See https://quay.io/repository/pypa/manylinux1_x86_64?tab=history
 # to update base image.
-FROM quay.io/pypa/manylinux1_x86_64@sha256:e7ed385da2363ea796385bb106a98364f7a8a658a5e8dbf1b7e4c71f2f299251
+FROM quay.io/pypa/manylinux1_x86_64:latest
 
 # Install dependencies
 RUN yum install -y xz ccache flex wget && yum clean all
@@ -56,12 +56,12 @@ ADD scripts/build_flatbuffers.sh /
 RUN /build_flatbuffers.sh
 ENV FLATBUFFERS_HOME /usr
 
-ADD scripts/build_bison.sh /
-RUN /build_bison.sh
+#ADD scripts/build_bison.sh /
+#RUN /build_bison.sh
 
-ADD scripts/build_thrift.sh /
-RUN /build_thrift.sh
-ENV THRIFT_HOME /usr
+#ADD scripts/build_thrift.sh /
+#RUN /build_thrift.sh
+#ENV THRIFT_HOME /usr
 
 ADD scripts/build_brotli.sh /
 RUN /build_brotli.sh

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 install

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 2.7 32)/bin/python" \
     -GNinja \
     ..

diff --git a/python/manylinux1/scripts/install_cmake.sh b/python/manylinux1/scripts/install_cmake.sh
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-/opt/python/cp37-cp37m/bin/pip install cmake ninja
+/opt/python/cp37-cp37m/bin/pip install cmake==3.13.3 ninja
 ln -s /opt/python/cp37-cp37m/bin/cmake /usr/bin/cmake
 ln -s /opt/python/cp37-cp37m/bin/ninja /usr/bin/ninja
 strip /opt/_internal/cpython-3.*/lib/python3.7/site-packages/cmake/data/bin/*