From 2923564677cdb9975536f479f9f8700dd5f80643 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Mon, 11 May 2015 11:24:19 -0400
Subject: [PATCH] base: Build ninja from source.

There were some issues with ninja/cpack. Bump to the latest version, 1.5.3,
resolves them.
---
 Dockerfile | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b747ab4..8a880cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,8 +14,8 @@ RUN apt-get update && apt-get -y install \
   libssl-dev \
   make \
   ncurses-dev \
-  ninja-build \
   pkg-config \
+  python \
   rsync \
   sed \
   tar \
@@ -27,8 +27,8 @@ RUN apt-get update && apt-get -y install \
 WORKDIR /usr/src
 # nighty-master 2015-05-04
 RUN git clone git://cmake.org/cmake.git CMake && \
-  cd CMake \
-  && git checkout 6cd6d50871ce28d0c72336a6aca01814487df5e1
+  cd CMake && \
+  git checkout 6cd6d50871ce28d0c72336a6aca01814487df5e1
 RUN mkdir CMake-build
 WORKDIR /usr/src/CMake-build
 RUN /usr/src/CMake/bootstrap \
@@ -36,3 +36,12 @@ RUN /usr/src/CMake/bootstrap \
     --prefix=/usr && \
   make -j$(nproc) install && \
   rm -rf *
+WORKDIR /usr/src
+
+# Build and install Ninja from source
+RUN git clone https://github.com/martine/ninja.git && \
+  cd ninja && \
+  git checkout v1.5.3 && \
+  python ./configure.py --bootstrap && \
+  ./ninja && \
+  cp ./ninja /usr/bin/