From dc20dd034ea41e283447b7c68c146a0bc1b9a37c Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 7 Nov 2020 21:35:21 +0100 Subject: [PATCH] Install rust cross-toolchain --- images/base-win32/Dockerfile | 2 ++ images/base-win64/Dockerfile | 2 ++ images/base/Dockerfile | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/images/base-win32/Dockerfile b/images/base-win32/Dockerfile index f82e582..b817a08 100644 --- a/images/base-win32/Dockerfile +++ b/images/base-win32/Dockerfile @@ -12,6 +12,8 @@ RUN \ rm /usr/*-w64-mingw32/lib/*.dll.a && \ mkdir /opt/ffbuild +RUN rustup target add i686-pc-windows-gnu + ADD toolchain.cmake /toolchain.cmake ADD cross.meson /cross.meson diff --git a/images/base-win64/Dockerfile b/images/base-win64/Dockerfile index 5a0cf4a..410e984 100644 --- a/images/base-win64/Dockerfile +++ b/images/base-win64/Dockerfile @@ -12,6 +12,8 @@ RUN \ rm /usr/*-w64-mingw32/lib/*.dll.a && \ mkdir /opt/ffbuild +RUN rustup target add x86_64-pc-windows-gnu + ADD toolchain.cmake /toolchain.cmake ADD cross.meson /cross.meson diff --git a/images/base/Dockerfile b/images/base/Dockerfile index 605e9c1..7a7a485 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -5,9 +5,12 @@ ENV DEBIAN_FRONTEND noninteractive RUN \ apt-get -y update && \ apt-get -y dist-upgrade && \ - apt-get -y install build-essential yasm nasm pkg-config git curl wget cmake unzip subversion autoconf automake libtool cmake clang texinfo texi2html gperf ragel libc6-dev gawk meson ninja-build p7zip-full python3-distutils python3-apt && \ + apt-get -y install build-essential yasm nasm pkg-config git curl wget cmake unzip subversion autoconf automake libtool autopoint cmake clang texinfo texi2html gperf gettext itstool ragel libc6-dev gtk-doc-tools gobject-introspection gawk meson ninja-build p7zip-full python3-distutils python3-apt && \ apt-get -y clean +ENV CARGO_HOME="/opt/cargo" RUSTUP_HOME="/opt/rustup" PATH="/opt/cargo/bin:${PATH}" +RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --no-modify-path + ADD run_stage.sh /usr/bin/run_stage ADD git-mini-clone.sh /usr/bin/git-mini-clone ADD check-wget.sh /usr/bin/check-wget