From 6f7e7b05fde4f95b7f259c680ba665665bd5f529 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Sat, 5 Nov 2016 11:24:32 -0400
Subject: [PATCH] common.docker: Fix CMake https download building it against
 openssl 1.0.2j

See #63
---
 common.docker | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/common.docker b/common.docker
index 1fbe521..8597c9f 100644
--- a/common.docker
+++ b/common.docker
@@ -5,7 +5,13 @@ RUN git clone "https://github.com/nojhan/liquidprompt.git" && \
 COPY imagefiles/.bashrc /root/
 
 WORKDIR /usr/src
-RUN git clone git://cmake.org/cmake.git CMake && \
+RUN wget https://www.openssl.org/source/openssl-1.0.2j.tar.gz && \
+  tar -xzvf openssl-1.0.2j.tar.gz && \
+  cd openssl-1.0.2j && \
+  ./config && \
+  make && \
+  cd .. && \
+  git clone git://cmake.org/cmake.git CMake && \
   cd CMake && \
   git checkout ab2ae4823c3b60347825da4b851cd4e676f8bed1 && \
   mkdir /usr/src/CMake-build && \
@@ -16,11 +22,13 @@ RUN git clone git://cmake.org/cmake.git CMake && \
   make -j$(grep -c processor /proc/cpuinfo) && \
   ./bin/cmake \
     -DCMAKE_BUILD_TYPE:STRING=Release \
-    -DCMAKE_USE_OPENSSL:BOOL=ON . && \
+    -DCMAKE_USE_OPENSSL:BOOL=ON \
+    -DOPENSSL_ROOT_DIR:PATH=/usr/src/openssl-1.0.2j \
+    . && \
   make install && \
-  cd .. && rm -rf CMake*
+  cd .. && rm -rf CMake* && rm -rf /usr/src/openssl-1.0.2j
 
-RUN git clone "https://github.com/martine/ninja.git" && \
+RUN git clone "https://github.com/ninja-build/ninja.git" && \
    cd ninja && \
    git checkout v1.7.1 && \
    ([ -e /opt/python/cp35-cp35m/bin/python ] && /opt/python/cp35-cp35m/bin/python ./configure.py --bootstrap) || python ./configure.py --bootstrap && \