From f22865db7f94fbaad46b85ff32275548d6ac6b5a Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 4 Aug 2021 15:12:10 +0200 Subject: [PATCH] Update crosstool-ng, mxe and wasm Update crosstool-ng, mxe and wasm Signed-off-by: Bensuperpc --- common/common.windows | 4 ++-- linux-arm64/Dockerfile.in | 4 ++-- linux-armv5-musl/Dockerfile.in | 4 ++-- linux-armv5/Dockerfile.in | 4 ++-- linux-armv6/Dockerfile.in | 4 ++-- linux-armv7/Dockerfile.in | 4 ++-- linux-armv7a/Dockerfile.in | 4 ++-- linux-m68k-uclibc/Dockerfile.in | 4 ++-- linux-mips/Dockerfile.in | 4 ++-- linux-ppc64le/Dockerfile.in | 4 ++-- linux-riscv32/Dockerfile.in | 4 ++-- linux-riscv64/Dockerfile.in | 4 ++-- linux-s390x/Dockerfile.in | 4 ++-- web-wasm/Dockerfile.in | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/common/common.windows b/common/common.windows index ec8d09c..0d71e6c 100644 --- a/common/common.windows +++ b/common/common.windows @@ -15,8 +15,8 @@ # ARG MXE_TARGET_LINK=shared # -# mxe master 2021-07-07 -ARG MXE_GIT_TAG=29aac96601e6428900b1e9b2befb4cc567aff298 +# mxe master 2021-08-04 +ARG MXE_GIT_TAG=91e21fc4bc0775790b0a7cc3f7da4aef89637a0f ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake diff --git a/linux-arm64/Dockerfile.in b/linux-arm64/Dockerfile.in index d710e50..814152a 100644 --- a/linux-arm64/Dockerfile.in +++ b/linux-arm64/Dockerfile.in @@ -4,8 +4,8 @@ FROM dockcross/base:latest # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-armv5-musl/Dockerfile.in b/linux-armv5-musl/Dockerfile.in index 86e68ee..5928f16 100755 --- a/linux-armv5-musl/Dockerfile.in +++ b/linux-armv5-musl/Dockerfile.in @@ -6,8 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # musleabi as default glibc # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-armv5/Dockerfile.in b/linux-armv5/Dockerfile.in index 4e7c045..9883a80 100644 --- a/linux-armv5/Dockerfile.in +++ b/linux-armv5/Dockerfile.in @@ -6,8 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-armv6/Dockerfile.in b/linux-armv6/Dockerfile.in index 630c814..15070e3 100644 --- a/linux-armv6/Dockerfile.in +++ b/linux-armv6/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e # This is for 32-bit ARMv6 Linux # Raspberry Pi is ARMv6+VFP2 diff --git a/linux-armv7/Dockerfile.in b/linux-armv7/Dockerfile.in index 8ba204a..9e5b646 100644 --- a/linux-armv7/Dockerfile.in +++ b/linux-armv7/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e # This is for 32-bit ARMv7 Linux #include "common.crosstool" diff --git a/linux-armv7a/Dockerfile.in b/linux-armv7a/Dockerfile.in index 56e1833..3afd57a 100644 --- a/linux-armv7a/Dockerfile.in +++ b/linux-armv7a/Dockerfile.in @@ -4,8 +4,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # This is for 32-bit ARMv7 Linux # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-m68k-uclibc/Dockerfile.in b/linux-m68k-uclibc/Dockerfile.in index bcedd8c..cc2e259 100644 --- a/linux-m68k-uclibc/Dockerfile.in +++ b/linux-m68k-uclibc/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ARG QEMU_VERSION=6.0.0 diff --git a/linux-mips/Dockerfile.in b/linux-mips/Dockerfile.in index 2af6798..a288424 100644 --- a/linux-mips/Dockerfile.in +++ b/linux-mips/Dockerfile.in @@ -4,8 +4,8 @@ FROM dockcross/base:latest # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-ppc64le/Dockerfile.in b/linux-ppc64le/Dockerfile.in index 9ae0583..af74e8d 100644 --- a/linux-ppc64le/Dockerfile.in +++ b/linux-ppc64le/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ARG QEMU_VERSION=6.0.0 diff --git a/linux-riscv32/Dockerfile.in b/linux-riscv32/Dockerfile.in index 03cb82c..fa5b681 100644 --- a/linux-riscv32/Dockerfile.in +++ b/linux-riscv32/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ARG QEMU_VERSION=6.0.0 diff --git a/linux-riscv64/Dockerfile.in b/linux-riscv64/Dockerfile.in index c80dbe3..61b9f04 100644 --- a/linux-riscv64/Dockerfile.in +++ b/linux-riscv64/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ARG QEMU_VERSION=6.0.0 diff --git a/linux-s390x/Dockerfile.in b/linux-s390x/Dockerfile.in index d7004ad..b5d9464 100644 --- a/linux-s390x/Dockerfile.in +++ b/linux-s390x/Dockerfile.in @@ -4,8 +4,8 @@ FROM dockcross/base:latest # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/web-wasm/Dockerfile.in b/web-wasm/Dockerfile.in index 47d500b..94f7d29 100644 --- a/web-wasm/Dockerfile.in +++ b/web-wasm/Dockerfile.in @@ -1,4 +1,4 @@ -FROM emscripten/emsdk:2.0.25 +FROM emscripten/emsdk:2.0.26 MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Revert back to "/bin/sh" as default shell @@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python #include "common.docker" -ENV EMSCRIPTEN_VERSION 2.0.25 +ENV EMSCRIPTEN_VERSION 2.0.26 ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH} ENV CC=/emsdk/upstream/emscripten/emcc \