Update CMake.

cross-rs · Jan 1, 2020 · 9993a51 · 9993a51
1 parent 105a4ae
commit 9993a51
Show file tree

Hide file tree

Showing 45 changed files with 132 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 /