From 07e5aecff31eee3e60d673a051b40627d3514225 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Wed, 25 Oct 2017 12:13:05 -0400
Subject: [PATCH] windows-{x64,x86}: Bump MXE to 2017-10-25 master

MXE now ships its own version of CMake that sources the toolchain file,
etc. As suggested by their warning when sourcing the toolchain file, use
it.

This also results in updating GCC from 4.9 to 5.4.
---
 windows-x64/Dockerfile | 8 ++++++--
 windows-x86/Dockerfile | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/windows-x64/Dockerfile b/windows-x64/Dockerfile
index 61d06db..1ccfb65 100644
--- a/windows-x64/Dockerfile
+++ b/windows-x64/Dockerfile
@@ -48,10 +48,10 @@ ENV WINEARCH win64
 RUN wine hostname
 
 WORKDIR /usr/src
-# mxe master 2016-10-25
+# mxe master 2017-10-25
 RUN git clone https://github.com/mxe/mxe.git && \
   cd mxe && \
-  git checkout 2c8b747d9cf58672040ff7443d2c365dba978fa5
+  git checkout 994ad47302e8811614b7eb49fc05234942b95b89
 WORKDIR /usr/src/mxe
 COPY settings.mk /usr/src/mxe/
 RUN make -j$(nproc)
@@ -70,6 +70,10 @@ WORKDIR /work
 
 ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/x86_64-w64-mingw32.static/share/cmake/mxe-conf.cmake
 RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE}
+RUN cd /usr/local/bin \
+  && rm cmake \
+  && ln -s /usr/src/mxe/usr/bin/x86_64-w64-mingw32.static-cmake cmake \
+  && ln -s /usr/src/mxe/usr/bin/x86_64-w64-mingw32.static-cpack cpack
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
diff --git a/windows-x86/Dockerfile b/windows-x86/Dockerfile
index e8fcf76..fbe064d 100644
--- a/windows-x86/Dockerfile
+++ b/windows-x86/Dockerfile
@@ -48,10 +48,10 @@ ENV WINEARCH win32
 RUN wine hostname
 
 WORKDIR /usr/src
-# mxe master 2016-10-25
+# mxe master 2017-10-25
 RUN git clone https://github.com/mxe/mxe.git && \
   cd mxe && \
-  git checkout 2c8b747d9cf58672040ff7443d2c365dba978fa5
+  git checkout 994ad47302e8811614b7eb49fc05234942b95b89
 WORKDIR /usr/src/mxe
 COPY settings.mk /usr/src/mxe/
 RUN make -j$(nproc)
@@ -70,6 +70,10 @@ WORKDIR /work
 
 ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake
 RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE}
+RUN cd /usr/local/bin \
+  && rm cmake \
+  && ln -s /usr/src/mxe/usr/bin/i686-w64-mingw32.static-cmake cmake \
+  && ln -s /usr/src/mxe/usr/bin/i686-w64-mingw32.static-cpack cpack
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE