From cc5e82b2f7b93c1fa3f0c51baeedecdd7cde4806 Mon Sep 17 00:00:00 2001 From: Ilya Biryukov Date: Mon, 22 Jan 2018 17:19:41 +0000 Subject: [PATCH] [Dockerfiles] Use a newer version of ninja when building inside debian8. 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 llvm-svn: 323134 --- llvm/utils/docker/debian8/build/Dockerfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/llvm/utils/docker/debian8/build/Dockerfile b/llvm/utils/docker/debian8/build/Dockerfile index 5c5ed6744963..3f42f2ad5916 100644 --- a/llvm/utils/docker/debian8/build/Dockerfile +++ b/llvm/utils/docker/debian8/build/Dockerfile @@ -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