diff options
| author | Abhishek Arya <inferno@chromium.org> | 2021-01-14 15:11:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-14 15:11:59 -0800 |
| commit | a252dc2d3a9944f335d07f7996b602a7180d858b (patch) | |
| tree | 8a82e46b1b06d4874e7cfb83c1b593ddbed8ef81 /infra/base-images/base-clang | |
| parent | 9eb1b873c5982add79fd06c2a7b4a83dc162ffc5 (diff) | |
| download | oss-fuzz-a252dc2d3a9944f335d07f7996b602a7180d858b.tar.gz | |
Use python3 in checkout_build_install_llvm.sh, revert python move patches. (#4974)
* Revert "Update Dockerfile"
This reverts commit 5eae19fb57becfaf090f74ada887c040edbeca35.
* Revert "Move python 3 install to base-clang, needed for clang build. (#4967)"
This reverts commit 018314eefa3a247f48f0f063f351576b793e5d96.
* Use python3 in checkout_build_install_llvm.sh
Diffstat (limited to 'infra/base-images/base-clang')
| -rw-r--r-- | infra/base-images/base-clang/Dockerfile | 37 | ||||
| -rwxr-xr-x | infra/base-images/base-clang/checkout_build_install_llvm.sh | 2 |
2 files changed, 5 insertions, 34 deletions
diff --git a/infra/base-images/base-clang/Dockerfile b/infra/base-images/base-clang/Dockerfile index 304f9a4f9..928e7934f 100644 --- a/infra/base-images/base-clang/Dockerfile +++ b/infra/base-images/base-clang/Dockerfile @@ -18,43 +18,14 @@ FROM gcr.io/oss-fuzz-base/base-image -RUN apt-get update && \ - apt-get install -y \ - build-essential \ - wget - -# Build and install latest Python 3 (3.8.7). -ENV PYTHON_VERSION 3.8.7 -RUN export PYTHON_DEPS="\ - zlib1g-dev \ - libncurses5-dev \ - libgdbm-dev \ - libnss3-dev \ - libssl-dev \ - libsqlite3-dev \ - libreadline-dev \ - libffi-dev \ - libbz2-dev \ - liblzma-dev" && \ - unset CFLAGS CXXFLAGS && \ - apt-get install -y $PYTHON_DEPS && \ - cd /tmp/ && \ - wget https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz && \ - tar -xvf Python-$PYTHON_VERSION.tar.xz && \ - cd Python-$PYTHON_VERSION && \ - ./configure --enable-optimizations --enable-shared && \ - make -j install && \ - ldconfig && \ - cd .. && \ - rm -r /tmp/Python-$PYTHON_VERSION.tar.xz /tmp/Python-$PYTHON_VERSION && \ - apt-get remove -y $PYTHON_DEPS # https://github.com/google/oss-fuzz/issues/3888 - # Install newer cmake. ENV CMAKE_VERSION 3.19.2 -RUN wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.sh && \ +RUN apt-get update && apt-get install -y wget sudo && \ + wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.sh && \ chmod +x cmake-$CMAKE_VERSION-Linux-x86_64.sh && \ ./cmake-$CMAKE_VERSION-Linux-x86_64.sh --skip-license --prefix="/usr/local" && \ - rm cmake-$CMAKE_VERSION-Linux-x86_64.sh + rm cmake-$CMAKE_VERSION-Linux-x86_64.sh && \ + SUDO_FORCE_REMOVE=yes apt-get remove --purge -y wget sudo COPY checkout_build_install_llvm.sh /root/ # Keep all steps in the same script to decrease the number of intermediate diff --git a/infra/base-images/base-clang/checkout_build_install_llvm.sh b/infra/base-images/base-clang/checkout_build_install_llvm.sh index d17e704fb..711255099 100755 --- a/infra/base-images/base-clang/checkout_build_install_llvm.sh +++ b/infra/base-images/base-clang/checkout_build_install_llvm.sh @@ -17,7 +17,7 @@ NPROC=16 # See issue #4270. The compiler crashes on GCB instance with 32 vCPUs. -LLVM_DEP_PACKAGES="build-essential make cmake ninja-build git python2.7 g++-multilib binutils-dev" +LLVM_DEP_PACKAGES="build-essential make cmake ninja-build git python3 g++-multilib binutils-dev" apt-get install -y $LLVM_DEP_PACKAGES # Checkout |