Commit 98a0f8e9 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

vlc-debian-win*: Upgrade GCC to 6.4

Hopefully those will have less ICE happening.
parent acc2109e
FROM registry.videolan.org:5000/videolan-base-stretch:latest FROM registry.videolan.org:5000/videolan-base-stretch:latest
ENV IMAGE_DATE=201710041546 ENV IMAGE_DATE=201710261055
RUN set -x && \ RUN set -x && \
apt-get update -qq && apt-get install -qqy \ apt-get update -qq && apt-get install -qqy \
...@@ -16,7 +16,7 @@ ENV TOOLCHAIN_PREFIX=/opt/gcc-$TARGET_TUPLE ...@@ -16,7 +16,7 @@ ENV TOOLCHAIN_PREFIX=/opt/gcc-$TARGET_TUPLE
ENV MINGW_PREFIX=$TOOLCHAIN_PREFIX/$TARGET_TUPLE ENV MINGW_PREFIX=$TOOLCHAIN_PREFIX/$TARGET_TUPLE
ENV PATH=$TOOLCHAIN_PREFIX/bin:$PATH ENV PATH=$TOOLCHAIN_PREFIX/bin:$PATH
ENV GCC_VERSION=6.2.0 ENV GCC_VERSION=6.4.0
ENV BINUTILS_VERSION=2.27 ENV BINUTILS_VERSION=2.27
ENV MPFR_VERSION=3.1.6 ENV MPFR_VERSION=3.1.6
ENV GMP_VERSION=6.1.1 ENV GMP_VERSION=6.1.1
...@@ -28,11 +28,11 @@ RUN set -x && \ ...@@ -28,11 +28,11 @@ RUN set -x && \
mkdir $MINGW_PREFIX && \ mkdir $MINGW_PREFIX && \
ln -s $MINGW_PREFIX $TOOLCHAIN_PREFIX/mingw && \ ln -s $MINGW_PREFIX $TOOLCHAIN_PREFIX/mingw && \
wget -q http://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS_VERSION.tar.bz2 && \ wget -q http://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS_VERSION.tar.bz2 && \
wget -q ftp://ftp.uvsq.fr/pub/gcc/releases/gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.bz2 && \ wget -q ftp://ftp.uvsq.fr/pub/gcc/releases/gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz && \
git config --global user.name "VideoLAN Buildbot" && \ git config --global user.name "VideoLAN Buildbot" && \
git config --global user.email buildbot@videolan.org && \ git config --global user.email buildbot@videolan.org && \
git clone --depth=1 git://git.code.sf.net/p/mingw-w64/mingw-w64 && \ git clone --depth=1 git://git.code.sf.net/p/mingw-w64/mingw-w64 && \
tar xf gcc-$GCC_VERSION.tar.bz2 && \ tar xf gcc-$GCC_VERSION.tar.xz && \
tar xf binutils-$BINUTILS_VERSION.tar.bz2 && \ tar xf binutils-$BINUTILS_VERSION.tar.bz2 && \
cd binutils-$BINUTILS_VERSION && mkdir build && cd build && \ cd binutils-$BINUTILS_VERSION && mkdir build && cd build && \
../configure --prefix=$TOOLCHAIN_PREFIX --target=$TARGET_TUPLE \ ../configure --prefix=$TOOLCHAIN_PREFIX --target=$TARGET_TUPLE \
......
FROM registry.videolan.org:5000/videolan-base-stretch:latest FROM registry.videolan.org:5000/videolan-base-stretch:latest
ENV IMAGE_DATE=201710041546 ENV IMAGE_DATE=201710261110
# We still need an i686 cross compiler to build the installer # We still need an i686 cross compiler to build the installer
RUN set -x && \ RUN set -x && \
...@@ -14,7 +14,7 @@ RUN set -x && \ ...@@ -14,7 +14,7 @@ RUN set -x && \
TOOLCHAIN_PREFIX=/opt/gcc-$TARGET_TUPLE \ TOOLCHAIN_PREFIX=/opt/gcc-$TARGET_TUPLE \
MINGW_PREFIX=$TOOLCHAIN_PREFIX/$TARGET_TUPLE \ MINGW_PREFIX=$TOOLCHAIN_PREFIX/$TARGET_TUPLE \
PATH=$TOOLCHAIN_PREFIX/bin:$PATH \ PATH=$TOOLCHAIN_PREFIX/bin:$PATH \
GCC_VERSION=6.2.0 \ GCC_VERSION=6.4.0 \
BINUTILS_VERSION=2.27 \ BINUTILS_VERSION=2.27 \
MPFR_VERSION=3.1.6 \ MPFR_VERSION=3.1.6 \
GMP_VERSION=6.1.1 \ GMP_VERSION=6.1.1 \
...@@ -25,11 +25,11 @@ RUN set -x && \ ...@@ -25,11 +25,11 @@ RUN set -x && \
mkdir $MINGW_PREFIX && \ mkdir $MINGW_PREFIX && \
ln -s $MINGW_PREFIX $TOOLCHAIN_PREFIX/mingw && \ ln -s $MINGW_PREFIX $TOOLCHAIN_PREFIX/mingw && \
wget -q http://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS_VERSION.tar.bz2 && \ wget -q http://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS_VERSION.tar.bz2 && \
wget -q ftp://ftp.uvsq.fr/pub/gcc/releases/gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.bz2 && \ wget -q ftp://ftp.uvsq.fr/pub/gcc/releases/gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz && \
git config --global user.name "VideoLAN Buildbot" && \ git config --global user.name "VideoLAN Buildbot" && \
git config --global user.email buildbot@videolan.org && \ git config --global user.email buildbot@videolan.org && \
git clone --depth=1 git://git.code.sf.net/p/mingw-w64/mingw-w64 && \ git clone --depth=1 git://git.code.sf.net/p/mingw-w64/mingw-w64 && \
tar xf gcc-$GCC_VERSION.tar.bz2 && \ tar xf gcc-$GCC_VERSION.tar.xz && \
tar xf binutils-$BINUTILS_VERSION.tar.bz2 && \ tar xf binutils-$BINUTILS_VERSION.tar.bz2 && \
cd binutils-$BINUTILS_VERSION && mkdir build && cd build && \ cd binutils-$BINUTILS_VERSION && mkdir build && cd build && \
../configure --prefix=$TOOLCHAIN_PREFIX --target=$TARGET_TUPLE \ ../configure --prefix=$TOOLCHAIN_PREFIX --target=$TARGET_TUPLE \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment