windows-x86: Update to master 2016-04-09.

This commit is contained in:
Matt McCormick 2016-04-16 21:34:30 -04:00
parent 8fca54adb4
commit 344b514327

View File

@ -20,6 +20,7 @@ RUN apt-get update && apt-get -y install \
gperf \ gperf \
intltool \ intltool \
libffi-dev \ libffi-dev \
libgdk-pixbuf2.0-dev \
libtool-bin \ libtool-bin \
libltdl-dev \ libltdl-dev \
libssl-dev \ libssl-dev \
@ -27,6 +28,7 @@ RUN apt-get update && apt-get -y install \
libc6-dev-i386 \ libc6-dev-i386 \
make \ make \
openssl \ openssl \
p7zip-full \
patch \ patch \
perl \ perl \
pkg-config \ pkg-config \
@ -46,10 +48,10 @@ ENV WINEARCH win32
RUN wine hostname RUN wine hostname
WORKDIR /usr/src WORKDIR /usr/src
# mxe master 2015-03-12, prior to mingw-w64 update, based on GCC 4 # mxe master 2016-04-09
RUN git clone https://github.com/mxe/mxe.git && \ RUN git clone https://github.com/mxe/mxe.git && \
cd mxe && \ cd mxe && \
git checkout 149afe17a43c50c234dcadeb4a69e61e272a747a git checkout 4accc990de7741f4d5aa37e368a732f3d47d803a
WORKDIR /usr/src/mxe WORKDIR /usr/src/mxe
COPY settings.mk /usr/src/mxe/ COPY settings.mk /usr/src/mxe/
RUN make -j$(nproc) RUN make -j$(nproc)