OSDN Git Service

[Dockerfiles] Use a newer version of ninja when building inside debian8.
authorIlya Biryukov <ibiryukov@google.com>
Mon, 22 Jan 2018 17:19:41 +0000 (17:19 +0000)
committerIlya Biryukov <ibiryukov@google.com>
Mon, 22 Jan 2018 17:19:41 +0000 (17:19 +0000)
Summary:
The debian8 repos have an old version of ninja that seems to sometimes crash
when building llvm.

Reviewers: ioeric, mehdi_amini

Reviewed By: ioeric

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D42304

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@323134 91177308-0d34-0410-b5e6-96231b3b80d8

utils/docker/debian8/build/Dockerfile

index 5c5ed67..3f42f2a 100644 (file)
@@ -19,9 +19,17 @@ RUN grep deb /etc/apt/sources.list | \
 # Install compiler, python and subversion.
 RUN apt-get update && \
     apt-get install -y --no-install-recommends ca-certificates gnupg \
-           build-essential python wget subversion ninja-build && \
+           build-essential python wget subversion unzip && \
     rm -rf /var/lib/apt/lists/*
 
+# Install a newer ninja release. It seems the older version in the debian repos
+# randomly crashes when compiling llvm.
+RUN wget "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip" && \
+    echo "d2fea9ff33b3ef353161ed906f260d565ca55b8ca0568fa07b1d2cab90a84a07 ninja-linux.zip" \
+        | sha256sum -c  && \
+    unzip ninja-linux.zip -d /usr/local/bin && \
+    rm ninja-linux.zip
+
 # Import public key required for verifying signature of cmake download.
 RUN gpg --keyserver hkp://pgp.mit.edu --recv 0x2D2CEF1034921684