From 9993a510e3abf99d576782c57285f9649bbeaa6e Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sat, 28 Dec 2019 12:44:23 +0100 Subject: [PATCH] Update CMake. --- docker/Dockerfile.aarch64-linux-android | 3 +++ docker/Dockerfile.aarch64-unknown-linux-gnu | 7 +++---- docker/Dockerfile.aarch64-unknown-linux-musl | 3 +++ docker/Dockerfile.arm-linux-androideabi | 3 +++ docker/Dockerfile.arm-unknown-linux-gnueabi | 7 +++---- docker/Dockerfile.arm-unknown-linux-gnueabihf | 7 +++---- docker/Dockerfile.arm-unknown-linux-musleabi | 3 +++ docker/Dockerfile.arm-unknown-linux-musleabihf | 3 +++ docker/Dockerfile.armv5te-unknown-linux-musleabi | 3 +++ docker/Dockerfile.armv7-linux-androideabi | 3 +++ docker/Dockerfile.armv7-unknown-linux-gnueabihf | 7 +++---- docker/Dockerfile.armv7-unknown-linux-musleabihf | 3 +++ docker/Dockerfile.asmjs-unknown-emscripten | 3 +++ docker/Dockerfile.i586-unknown-linux-gnu | 3 +++ docker/Dockerfile.i586-unknown-linux-musl | 3 +++ docker/Dockerfile.i686-linux-android | 3 +++ docker/Dockerfile.i686-unknown-linux-gnu | 7 +++---- docker/Dockerfile.i686-unknown-linux-musl | 3 +++ docker/Dockerfile.mips-unknown-linux-gnu | 3 +++ docker/Dockerfile.mips-unknown-linux-musl | 3 +++ docker/Dockerfile.mips64-unknown-linux-gnuabi64 | 3 +++ docker/Dockerfile.mips64el-unknown-linux-gnuabi64 | 3 +++ docker/Dockerfile.mipsel-unknown-linux-gnu | 3 +++ docker/Dockerfile.mipsel-unknown-linux-musl | 3 +++ docker/Dockerfile.powerpc-unknown-linux-gnu | 7 +++---- docker/Dockerfile.powerpc64-unknown-linux-gnu | 3 +++ docker/Dockerfile.powerpc64le-unknown-linux-gnu | 3 +++ docker/Dockerfile.s390x-unknown-linux-gnu | 3 +++ docker/Dockerfile.sparc64-unknown-linux-gnu | 3 +++ docker/Dockerfile.sparcv9-sun-solaris | 3 +++ docker/Dockerfile.thumbv6m-none-eabi | 3 +++ docker/Dockerfile.thumbv7em-none-eabi | 3 +++ docker/Dockerfile.thumbv7em-none-eabihf | 3 +++ docker/Dockerfile.thumbv7m-none-eabi | 3 +++ docker/Dockerfile.wasm32-unknown-emscripten | 3 +++ docker/Dockerfile.x86_64-linux-android | 3 +++ docker/Dockerfile.x86_64-pc-windows-gnu | 3 +++ docker/Dockerfile.x86_64-sun-solaris | 3 +++ docker/Dockerfile.x86_64-unknown-dragonfly | 3 +++ docker/Dockerfile.x86_64-unknown-linux-gnu | 11 +++-------- docker/Dockerfile.x86_64-unknown-linux-musl | 3 +++ docker/Dockerfile.x86_64-unknown-netbsd | 3 +++ docker/cmake.sh | 5 ++++- docker/common.sh | 3 ++- docker/emscripten.sh | 1 - 45 files changed, 132 insertions(+), 35 deletions(-) diff --git a/docker/Dockerfile.aarch64-linux-android b/docker/Dockerfile.aarch64-linux-android index 3a2d9025a..a9f2cbe89 100644 --- a/docker/Dockerfile.aarch64-linux-android +++ b/docker/Dockerfile.aarch64-linux-android @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu b/docker/Dockerfile.aarch64-unknown-linux-gnu index bc4fb2ff4..7d031c440 100644 --- a/docker/Dockerfile.aarch64-unknown-linux-gnu +++ b/docker/Dockerfile.aarch64-unknown-linux-gnu @@ -3,13 +3,12 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh -COPY cmake.sh / -RUN apt-get purge --auto-remove -y cmake && \ - /cmake.sh - RUN apt-get install -y --no-install-recommends \ g++-aarch64-linux-gnu \ libc6-dev-arm64-cross diff --git a/docker/Dockerfile.aarch64-unknown-linux-musl b/docker/Dockerfile.aarch64-unknown-linux-musl index 017e522a8..507de85d6 100644 --- a/docker/Dockerfile.aarch64-unknown-linux-musl +++ b/docker/Dockerfile.aarch64-unknown-linux-musl @@ -3,6 +3,9 @@ FROM ubuntu:18.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.arm-linux-androideabi b/docker/Dockerfile.arm-linux-androideabi index 16cd3a712..cab598385 100644 --- a/docker/Dockerfile.arm-linux-androideabi +++ b/docker/Dockerfile.arm-linux-androideabi @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabi b/docker/Dockerfile.arm-unknown-linux-gnueabi index a1db2b6b5..f6d8fef9e 100644 --- a/docker/Dockerfile.arm-unknown-linux-gnueabi +++ b/docker/Dockerfile.arm-unknown-linux-gnueabi @@ -3,13 +3,12 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh -COPY cmake.sh / -RUN apt-get purge --auto-remove -y cmake && \ - /cmake.sh - COPY qemu.sh / RUN apt-get install -y --no-install-recommends \ g++-arm-linux-gnueabi \ diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabihf b/docker/Dockerfile.arm-unknown-linux-gnueabihf index 99c862fe5..e6000acb3 100644 --- a/docker/Dockerfile.arm-unknown-linux-gnueabihf +++ b/docker/Dockerfile.arm-unknown-linux-gnueabihf @@ -3,13 +3,12 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh -COPY cmake.sh / -RUN apt-get purge --auto-remove -y cmake && \ - /cmake.sh - RUN mkdir /usr/arm-linux-gnueabihf && \ apt-get install -y --no-install-recommends curl xz-utils && \ cd /usr/arm-linux-gnueabihf && \ diff --git a/docker/Dockerfile.arm-unknown-linux-musleabi b/docker/Dockerfile.arm-unknown-linux-musleabi index 296d49668..ada77066a 100644 --- a/docker/Dockerfile.arm-unknown-linux-musleabi +++ b/docker/Dockerfile.arm-unknown-linux-musleabi @@ -3,6 +3,9 @@ FROM ubuntu:18.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.arm-unknown-linux-musleabihf b/docker/Dockerfile.arm-unknown-linux-musleabihf index 41e899e9c..32ac20a60 100644 --- a/docker/Dockerfile.arm-unknown-linux-musleabihf +++ b/docker/Dockerfile.arm-unknown-linux-musleabihf @@ -3,6 +3,9 @@ FROM ubuntu:18.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.armv5te-unknown-linux-musleabi b/docker/Dockerfile.armv5te-unknown-linux-musleabi index 3824207b2..e63546610 100644 --- a/docker/Dockerfile.armv5te-unknown-linux-musleabi +++ b/docker/Dockerfile.armv5te-unknown-linux-musleabi @@ -3,6 +3,9 @@ FROM ubuntu:18.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.armv7-linux-androideabi b/docker/Dockerfile.armv7-linux-androideabi index 11ffd5882..90f72b675 100644 --- a/docker/Dockerfile.armv7-linux-androideabi +++ b/docker/Dockerfile.armv7-linux-androideabi @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabihf b/docker/Dockerfile.armv7-unknown-linux-gnueabihf index a02154e75..deb56affb 100644 --- a/docker/Dockerfile.armv7-unknown-linux-gnueabihf +++ b/docker/Dockerfile.armv7-unknown-linux-gnueabihf @@ -3,13 +3,12 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh -COPY cmake.sh / -RUN apt-get purge --auto-remove -y cmake && \ - /cmake.sh - RUN apt-get install -y --no-install-recommends \ g++-arm-linux-gnueabihf \ libc6-dev-armhf-cross diff --git a/docker/Dockerfile.armv7-unknown-linux-musleabihf b/docker/Dockerfile.armv7-unknown-linux-musleabihf index df265e681..ed95d5083 100644 --- a/docker/Dockerfile.armv7-unknown-linux-musleabihf +++ b/docker/Dockerfile.armv7-unknown-linux-musleabihf @@ -3,6 +3,9 @@ FROM ubuntu:18.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.asmjs-unknown-emscripten b/docker/Dockerfile.asmjs-unknown-emscripten index cf9b8246b..566b70014 100644 --- a/docker/Dockerfile.asmjs-unknown-emscripten +++ b/docker/Dockerfile.asmjs-unknown-emscripten @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + RUN apt-get install -y --no-install-recommends python COPY emscripten.sh / diff --git a/docker/Dockerfile.i586-unknown-linux-gnu b/docker/Dockerfile.i586-unknown-linux-gnu index e7fb7a585..67db7de36 100644 --- a/docker/Dockerfile.i586-unknown-linux-gnu +++ b/docker/Dockerfile.i586-unknown-linux-gnu @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.i586-unknown-linux-musl b/docker/Dockerfile.i586-unknown-linux-musl index 5014f3e0e..204ba3782 100644 --- a/docker/Dockerfile.i586-unknown-linux-musl +++ b/docker/Dockerfile.i586-unknown-linux-musl @@ -3,6 +3,9 @@ FROM ubuntu:18.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.i686-linux-android b/docker/Dockerfile.i686-linux-android index fa3cdefe8..445b1982e 100644 --- a/docker/Dockerfile.i686-linux-android +++ b/docker/Dockerfile.i686-linux-android @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.i686-unknown-linux-gnu b/docker/Dockerfile.i686-unknown-linux-gnu index 414d798fc..7ee1bd874 100644 --- a/docker/Dockerfile.i686-unknown-linux-gnu +++ b/docker/Dockerfile.i686-unknown-linux-gnu @@ -3,13 +3,12 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh -COPY cmake.sh / -RUN apt-get purge --auto-remove -y cmake && \ - /cmake.sh - RUN apt-get install -y --no-install-recommends \ g++-multilib diff --git a/docker/Dockerfile.i686-unknown-linux-musl b/docker/Dockerfile.i686-unknown-linux-musl index c6d3ed18d..d0d2c57e6 100644 --- a/docker/Dockerfile.i686-unknown-linux-musl +++ b/docker/Dockerfile.i686-unknown-linux-musl @@ -3,6 +3,9 @@ FROM ubuntu:18.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.mips-unknown-linux-gnu b/docker/Dockerfile.mips-unknown-linux-gnu index 0419ae202..b8e030e95 100644 --- a/docker/Dockerfile.mips-unknown-linux-gnu +++ b/docker/Dockerfile.mips-unknown-linux-gnu @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.mips-unknown-linux-musl b/docker/Dockerfile.mips-unknown-linux-musl index 04257bd96..bc23ce1ce 100644 --- a/docker/Dockerfile.mips-unknown-linux-musl +++ b/docker/Dockerfile.mips-unknown-linux-musl @@ -3,6 +3,9 @@ FROM ubuntu:18.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.mips64-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64-unknown-linux-gnuabi64 index b06f33d26..d329ebb35 100644 --- a/docker/Dockerfile.mips64-unknown-linux-gnuabi64 +++ b/docker/Dockerfile.mips64-unknown-linux-gnuabi64 @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 index a94311451..0cc4a36c6 100644 --- a/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 +++ b/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.mipsel-unknown-linux-gnu b/docker/Dockerfile.mipsel-unknown-linux-gnu index 941df0eb6..98882ee96 100644 --- a/docker/Dockerfile.mipsel-unknown-linux-gnu +++ b/docker/Dockerfile.mipsel-unknown-linux-gnu @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.mipsel-unknown-linux-musl b/docker/Dockerfile.mipsel-unknown-linux-musl index c6ee462bd..b0cabb17c 100644 --- a/docker/Dockerfile.mipsel-unknown-linux-musl +++ b/docker/Dockerfile.mipsel-unknown-linux-musl @@ -3,6 +3,9 @@ FROM ubuntu:18.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.powerpc-unknown-linux-gnu b/docker/Dockerfile.powerpc-unknown-linux-gnu index d8fad1fb0..a14772e55 100644 --- a/docker/Dockerfile.powerpc-unknown-linux-gnu +++ b/docker/Dockerfile.powerpc-unknown-linux-gnu @@ -3,13 +3,12 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh -COPY cmake.sh / -RUN apt-get purge --auto-remove -y cmake && \ - /cmake.sh - RUN apt-get install -y --no-install-recommends \ g++-powerpc-linux-gnu \ libc6-dev-powerpc-cross diff --git a/docker/Dockerfile.powerpc64-unknown-linux-gnu b/docker/Dockerfile.powerpc64-unknown-linux-gnu index babf3bf7d..8ca72e816 100644 --- a/docker/Dockerfile.powerpc64-unknown-linux-gnu +++ b/docker/Dockerfile.powerpc64-unknown-linux-gnu @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.powerpc64le-unknown-linux-gnu b/docker/Dockerfile.powerpc64le-unknown-linux-gnu index a209f92e8..4c8ef0a20 100644 --- a/docker/Dockerfile.powerpc64le-unknown-linux-gnu +++ b/docker/Dockerfile.powerpc64le-unknown-linux-gnu @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.s390x-unknown-linux-gnu b/docker/Dockerfile.s390x-unknown-linux-gnu index 122d79d32..04405d002 100644 --- a/docker/Dockerfile.s390x-unknown-linux-gnu +++ b/docker/Dockerfile.s390x-unknown-linux-gnu @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.sparc64-unknown-linux-gnu b/docker/Dockerfile.sparc64-unknown-linux-gnu index bf89c936b..f423473ef 100644 --- a/docker/Dockerfile.sparc64-unknown-linux-gnu +++ b/docker/Dockerfile.sparc64-unknown-linux-gnu @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.sparcv9-sun-solaris b/docker/Dockerfile.sparcv9-sun-solaris index c58a541b1..3ff9a3863 100644 --- a/docker/Dockerfile.sparcv9-sun-solaris +++ b/docker/Dockerfile.sparcv9-sun-solaris @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.thumbv6m-none-eabi b/docker/Dockerfile.thumbv6m-none-eabi index 5907ba7d1..85da4a4ad 100644 --- a/docker/Dockerfile.thumbv6m-none-eabi +++ b/docker/Dockerfile.thumbv6m-none-eabi @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.thumbv7em-none-eabi b/docker/Dockerfile.thumbv7em-none-eabi index 09f86ce17..3cd744f44 100644 --- a/docker/Dockerfile.thumbv7em-none-eabi +++ b/docker/Dockerfile.thumbv7em-none-eabi @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.thumbv7em-none-eabihf b/docker/Dockerfile.thumbv7em-none-eabihf index 48e3c8d16..e3eec0335 100644 --- a/docker/Dockerfile.thumbv7em-none-eabihf +++ b/docker/Dockerfile.thumbv7em-none-eabihf @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.thumbv7m-none-eabi b/docker/Dockerfile.thumbv7m-none-eabi index e6f715b13..bb92ad7a9 100644 --- a/docker/Dockerfile.thumbv7m-none-eabi +++ b/docker/Dockerfile.thumbv7m-none-eabi @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.wasm32-unknown-emscripten b/docker/Dockerfile.wasm32-unknown-emscripten index a8b5210be..7eea037ac 100644 --- a/docker/Dockerfile.wasm32-unknown-emscripten +++ b/docker/Dockerfile.wasm32-unknown-emscripten @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + RUN apt-get install -y --no-install-recommends python COPY emscripten.sh / diff --git a/docker/Dockerfile.x86_64-linux-android b/docker/Dockerfile.x86_64-linux-android index be961ccc4..7558f4383 100644 --- a/docker/Dockerfile.x86_64-linux-android +++ b/docker/Dockerfile.x86_64-linux-android @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.x86_64-pc-windows-gnu b/docker/Dockerfile.x86_64-pc-windows-gnu index e136f6299..8c3eacf3a 100644 --- a/docker/Dockerfile.x86_64-pc-windows-gnu +++ b/docker/Dockerfile.x86_64-pc-windows-gnu @@ -3,6 +3,9 @@ FROM ubuntu:18.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.x86_64-sun-solaris b/docker/Dockerfile.x86_64-sun-solaris index 7251c031d..b8b240b18 100644 --- a/docker/Dockerfile.x86_64-sun-solaris +++ b/docker/Dockerfile.x86_64-sun-solaris @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.x86_64-unknown-dragonfly b/docker/Dockerfile.x86_64-unknown-dragonfly index 0be058a75..2f7193a77 100644 --- a/docker/Dockerfile.x86_64-unknown-dragonfly +++ b/docker/Dockerfile.x86_64-unknown-dragonfly @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.x86_64-unknown-linux-gnu b/docker/Dockerfile.x86_64-unknown-linux-gnu index a0fde9d10..5faa687e2 100644 --- a/docker/Dockerfile.x86_64-unknown-linux-gnu +++ b/docker/Dockerfile.x86_64-unknown-linux-gnu @@ -3,16 +3,11 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh -COPY xargo.sh / -RUN /xargo.sh - COPY cmake.sh / -RUN apt-get purge --auto-remove -y cmake && \ - /cmake.sh +RUN /cmake.sh -RUN apt-get install -y --no-install-recommends \ - g++ \ - zlib1g-dev +COPY xargo.sh / +RUN /xargo.sh COPY qemu.sh / RUN /qemu.sh x86_64 softmmu diff --git a/docker/Dockerfile.x86_64-unknown-linux-musl b/docker/Dockerfile.x86_64-unknown-linux-musl index 7bc8b1565..291358e4e 100644 --- a/docker/Dockerfile.x86_64-unknown-linux-musl +++ b/docker/Dockerfile.x86_64-unknown-linux-musl @@ -3,6 +3,9 @@ FROM ubuntu:18.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/Dockerfile.x86_64-unknown-netbsd b/docker/Dockerfile.x86_64-unknown-netbsd index 3c8964fa4..44d3d9cd1 100644 --- a/docker/Dockerfile.x86_64-unknown-netbsd +++ b/docker/Dockerfile.x86_64-unknown-netbsd @@ -3,6 +3,9 @@ FROM ubuntu:16.04 COPY common.sh / RUN /common.sh +COPY cmake.sh / +RUN /cmake.sh + COPY xargo.sh / RUN /xargo.sh diff --git a/docker/cmake.sh b/docker/cmake.sh index c4a04dcac..d32d6d6a1 100755 --- a/docker/cmake.sh +++ b/docker/cmake.sh @@ -4,12 +4,14 @@ set -x set -euo pipefail main() { - local version=3.5.1 + local version=3.16.2 local dependencies=( curl g++ + libssl-dev make + zlib1g-dev ) apt-get update @@ -27,6 +29,7 @@ main() { curl https://cmake.org/files/v${version%.*}/cmake-$version.tar.gz | \ tar --strip-components 1 -xz + ./bootstrap make -j$(nproc) make install diff --git a/docker/common.sh b/docker/common.sh index 05efd82ff..3b6beb966 100755 --- a/docker/common.sh +++ b/docker/common.sh @@ -10,9 +10,10 @@ apt-get install -y --no-install-recommends \ automake \ binutils \ ca-certificates \ - cmake \ + curl \ file \ gcc \ + g++ \ git \ libc6-dev \ libtool \ diff --git a/docker/emscripten.sh b/docker/emscripten.sh index c0ce0faae..562b3ae96 100755 --- a/docker/emscripten.sh +++ b/docker/emscripten.sh @@ -6,7 +6,6 @@ set -euo pipefail main() { local dependencies=( ca-certificates - cmake curl git python