From ad0e9e9aa433c02b1fd3296510184713123289f1 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Sun, 20 Mar 2016 18:23:31 -0400
Subject: [PATCH] linux-ppc64le: Update QEMU user version to 2.5.0.

Also, the build needs to come before environmental variables are set for the
cross-compiler.
---
 linux-ppc64le/Dockerfile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/linux-ppc64le/Dockerfile b/linux-ppc64le/Dockerfile
index 582fd10..a85a3c1 100644
--- a/linux-ppc64le/Dockerfile
+++ b/linux-ppc64le/Dockerfile
@@ -10,6 +10,17 @@ RUN apt-get update && apt-get install -y \
   crossbuild-essential-ppc64el \
   gfortran-powerpc64le-linux-gnu
 
+WORKDIR /usr/src
+
+RUN apt-get update && \
+  apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
+  curl -L http://wiki.qemu-project.org/download/qemu-2.5.0.tar.bz2 | tar xj && \
+  cd qemu-2.5.0 && \
+  ./configure --target-list=ppc64le-linux-user --prefix=/usr && \
+  make -j$(nproc) && \
+  make install && \
+  cd .. && rm -rf qemu-2.5.0
+
 ENV CROSS_TRIPLE powerpc64le-linux-gnu
 ENV CROSS_ROOT /usr/${CROSS_TRIPLE}
 ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
@@ -19,17 +30,6 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
     CXX=/usr/bin/${CROSS_TRIPLE}-g++ \
     LD=/usr/bin/${CROSS_TRIPLE}-ld
 
-WORKDIR /usr/src
-
-RUN apt-get update && \
-  apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
-  curl -L http://wiki.qemu-project.org/download/qemu-2.3.0.tar.bz2 | tar xj && \
-  cd qemu-2.3.0 && \
-  ./configure --target-list=ppc64le-linux-user --prefix=/usr && \
-  make -j$(nproc) && \
-  make install && \
-  cd .. && rm -rf qemu-2.3.0
-
 # Note: Toolchain file support is currently in debian Experimental according to:
 # https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29
 # We can switch to that when it becomes stable.