Merge remote-tracking branch 'origin/master' into update_crosstool-ng-mxe

Fix wrong file name in entrypoint dockcross -> dockcross.sh

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
 

imagefiles/entrypoint.sh

@@ -7,13 +7,13 @@ if [[ $# == 0 ]]; then
     # Presumably the image has been run directly, so help the user get
     # started by outputting the dockcross script
     if [[ -n $DEFAULT_DOCKCROSS_IMAGE ]]; then
-        head -n 2 /dockcross/dockcross
+        head -n 2 /dockcross/dockcross.sh
         echo "DEFAULT_DOCKCROSS_IMAGE=$DEFAULT_DOCKCROSS_IMAGE"
-        tail -n +4 /dockcross/dockcross |
+        tail -n +4 /dockcross/dockcross.sh |
           sed -e "s@dockcross\/linux\-armv7@${DEFAULT_DOCKCROSS_IMAGE}@g" |
           sed -e "s@dockcross\-linux\-armv7@${DEFAULT_DOCKCROSS_IMAGE//[\/:]/-}@g"
     else
-        cat /dockcross/dockcross
+        cat /dockcross/dockcross.sh
     fi
     exit 0
 fi

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"
 

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"
 

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"
 

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

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"

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"
 

linux-m68k-uclibc/Dockerfile.in

@@ -3,10 +3,10 @@ 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
 
-ENV QEMU_VERSION 6.0.0
+ARG QEMU_VERSION=6.0.0
 
 #include "common.crosstool"
 

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"
 

linux-ppc64le/Dockerfile.in

@@ -3,10 +3,10 @@ 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
 
-ENV QEMU_VERSION 6.0.0
+ARG QEMU_VERSION=6.0.0
 
 #include "common.crosstool"
 

linux-riscv32/Dockerfile.in

@@ -3,10 +3,10 @@ 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
 
-ENV QEMU_VERSION 6.0.0
+ARG QEMU_VERSION=6.0.0
 
 #include "common.crosstool"
 

linux-riscv64/Dockerfile.in

@@ -3,10 +3,10 @@ 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
 
-ENV QEMU_VERSION 6.0.0
+ARG QEMU_VERSION=6.0.0
 
 #include "common.crosstool"
 

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"
 

linux-x64-clang/Dockerfile.in

@@ -1,26 +1,33 @@
 FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
- # flang
+
+ARG CLANG_VERSION=13
+ENV CLANG_VERSION=${CLANG_VERSION}
+
 RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \
+    && echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" >> /etc/apt/sources.list \
     && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \
+    && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION}  main" >> /etc/apt/sources.list \
     && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
     && apt-get update \
     && apt-get purge --autoremove -y gcc g++ software-properties-common \
-    && apt-get -y install clang libc++-dev libc++abi-dev clang-format clang-tidy lldb \
+    && apt-get -y install clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev clang-format-${CLANG_VERSION} clang-tidy-${CLANG_VERSION} lldb-${CLANG_VERSION}  \
     && apt-get clean --yes \
     && rm -rf /var/lib/apt/lists/* \
-    && update-alternatives --install /usr/bin/cc cc /usr/bin/clang 90 \
-    && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 90 \
-    && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++ 90 \
+    && update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 90 \
+    && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${CLANG_VERSION} 90 \
+    && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++-${CLANG_VERSION} 90 \
+    && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 90 \
+    && update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION} 90 \
     && cc --version \
     && c++ --version \
     && cpp --version
 
 ENV CROSS_TRIPLE x86_64-linux-gnu
 ENV CROSS_ROOT /usr/bin
-ENV CC=/usr/bin/clang \
+ENV CC=/usr/bin/clang  \
     CPP=/usr/bin/cpp \
-    CXX=/usr/bin/clang++ \
+    CXX=/usr/bin/clang++  \
     LD=/usr/bin/lld \
     FC=/usr/bin/flang
 

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 \