Merge remote-tracking branch 'origin/master' into update_isl

.github/workflows/main.yml

@@ -62,6 +62,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=arm-linux-androideabi",
             }
           - {
               image: "android-arm64",
@@ -77,6 +79,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-linux-android",
             }
           - {
               image: "android-x86",
@@ -92,6 +96,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=i686-linux-android",
             }
           - {
               image: "android-x86_64",
@@ -107,6 +113,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=x86_64-linux-android",
             }
           # Linux arm64/armv8 images
           - {
@@ -123,6 +131,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
             }
           - {
               image: "linux-arm64-lts",
@@ -138,6 +148,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
             }
           - {
               image: "linux-arm64-musl",
@@ -153,6 +165,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-linux-musl",
             }
           - {
               image: "linux-arm64-full",
@@ -168,6 +182,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
             }
           # Linux armv5 images
           - {
@@ -184,6 +200,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv5-unknown-linux-gnueabi",
             }
           - {
               image: "linux-armv5-musl",
@@ -199,6 +217,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv5-unknown-linux-musleabi",
             }
           # Linux armv6 images
           - {
@@ -215,6 +235,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv6-unknown-linux-gnueabihf",
             }
           - {
               image: "linux-armv6-lts",
@@ -230,6 +252,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv6-unknown-linux-gnueabihf",
             }
           - {
               image: "linux-armv6-musl",
@@ -245,6 +269,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv6-linux-musleabihf",
             }
           # Linux armv7 images
           - {
@@ -261,6 +287,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv7-unknown-linux-gnueabi",
             }
           - {
               image: "linux-armv7a",
@@ -276,6 +304,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=arm-cortexa8_neon-linux-gnueabihf",
             }
           - {
               image: "linux-armv7l-musl",
@@ -291,6 +321,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv7l-linux-musleabihf",
             }
           # Linux x86 images
           - {
@@ -307,6 +339,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux x86_64 images
           - {
@@ -323,6 +357,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-x64-tinycc",
@@ -338,6 +374,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "",
             }
           - {
               image: "linux-x64-clang",
@@ -353,6 +391,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "",
             }
           - {
               image: "linux-x86_64-full",
@@ -368,6 +408,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=x86_64-buildroot-linux-gnu",
             }
           # Linux riscv images
           - {
@@ -384,6 +426,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=riscv32-unknown-linux-gnu",
             }
           - {
               image: "linux-riscv64",
@@ -399,6 +443,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=riscv64-unknown-linux-gnu",
             }
           # Linux s390x images
           - {
@@ -415,6 +461,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=s390x-ibm-linux-gnu",
             }
           # Linux mips images
           - {
@@ -431,6 +479,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=mips-unknown-linux-gnu",
             }
           # Linux ppc64le images
           - {
@@ -447,6 +497,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=powerpc64le-unknown-linux-gnu",
             }
           # Linux m68k images
           - {
@@ -463,6 +515,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "--host=x86_64-linux-gnu --build=m68k-unknown-uclinux-uclibc",
             }
           # Linux xtensa images
           - {
@@ -479,6 +533,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "--host=x86_64-linux-gnu --build=xtensa-fsf-linux-uclibc",
             }
           # Windows x86_x64 images
           - {
@@ -495,6 +551,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "",
             }
           - {
               image: "windows-static-x64-posix",
@@ -510,6 +568,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "",
             }
           - {
               image: "windows-shared-x64",
@@ -525,6 +585,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "",
             }
           - {
               image: "windows-shared-x64-posix",
@@ -540,6 +602,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "",
             }
           # Windows x86 images
           - {
@@ -556,6 +620,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "",
             }
           - {
               image: "windows-shared-x86",
@@ -571,6 +637,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "",
             }
           # Windows arm images
           - {
@@ -587,6 +655,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "",
             }
           - {
               image: "windows-arm64",
@@ -602,6 +672,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "",
             }
           # manylinux2014 images
           - {
@@ -618,6 +690,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "manylinux2014-x64",
@@ -633,6 +707,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           #          - {
           #              image: "manylinux2014-aarch64",
@@ -648,6 +724,8 @@ jobs:
           #              C-Plus-Plus_arg: "",
           #              fmt: "no",
           #              fmt_arg: "",
+          #              cpython: "yes",
+          #              cpython_arg: "",
           #            }
           # web-wasm images
           - {
@@ -664,6 +742,25 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "",
+            }
+          - {
+              image: "web-wasi",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "no",
+              ninja_arg: "",
+              openssl: "no",
+              openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
+              C: "no",
+              C_arg: "",
+              C-Plus-Plus: "no",
+              C-Plus-Plus_arg: "",
+              fmt: "no",
+              fmt_arg: "",
+              cpython: "no",
+              cpython_arg: "",
             }
     steps:
       - uses: actions/checkout@v2
@@ -677,6 +774,7 @@ jobs:
         run: make ${{ matrix.arch_name.image }}
       - name: basic test
         run: make ${{ matrix.arch_name.image }}.test
+      # Updated on 28/08/2021
       - name: stockfish build test
         if: ${{ matrix.arch_name.stockfish == 'yes' }}
         run: |
@@ -686,12 +784,14 @@ jobs:
           ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} build ${{ matrix.arch_name.stockfish_arg }} -j2
           cd ../..
           rm -rf Stockfish
+      # Updated on 28/08/2021
       - name: ninja build test
         if: ${{ matrix.arch_name.ninja == 'yes' }}
         run: |
           git clone --depth 1 --branch v1.10.2 https://github.com/ninja-build/ninja.git
           cd ninja
           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.ninja_arg }}
+      # Updated on 28/08/2021
       - name: openssl build test
         if: ${{ matrix.arch_name.openssl == 'yes' }}
         run: |
@@ -703,6 +803,7 @@ jobs:
           ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
           cd ..
           rm -rf openssl
+      # Updated on 28/08/2021
       - name: C build test
         if: ${{ matrix.arch_name.C == 'yes' }}
         run: |
@@ -712,6 +813,7 @@ jobs:
           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C_arg }}
           cd ..
           rm -rf C
+      # Updated on 28/08/2021
       - name: C-Plus-Plus build test
         if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' }}
         run: |
@@ -721,6 +823,7 @@ jobs:
           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
           cd ..
           rm -rf C-Plus-Plus
+      # Updated on 28/08/2021
       - name: fmt build test
         if: ${{ matrix.arch_name.fmt == 'yes' }}
         run: |
@@ -729,6 +832,16 @@ jobs:
           ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.fmt_arg }} -DFMT_DOC=OFF
           cd ..
           rm -rf fmt
+      # Updated on 05/10/2021
+      - name: cpython build test
+        if: ${{ matrix.arch_name.cpython == 'yes' }}
+        run: |
+          git clone --depth 1 --branch v3.9.2 https://github.com/python/cpython.git
+          cd cpython
+          ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no --disable-ipv6 ${{ matrix.arch_name.cpython_arg }}
+          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
+          cd ..
+          rm -rf cpython
       - name: deploy
         if: github.ref == 'refs/heads/master'
         run: |

Dockerfile.in

@@ -1,7 +1,7 @@
 ARG DOCKER_IMAGE=debian:bullseye-slim
 FROM $DOCKER_IMAGE
 
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 #include "common.debian"
 

Makefile

@@ -19,6 +19,7 @@ STANDARD_IMAGES = android-arm android-arm64 android-x86 android-x86_64 \
 	linux-armv6 linux-armv6-lts linux-armv6-musl linux-arm64-lts \
 	linux-armv7l-musl linux-armv7 linux-armv7a linux-x86_64-full \
 	linux-mips linux-ppc64le linux-riscv64 linux-riscv32 linux-xtensa-uclibc \
+	web-wasi \
 	windows-static-x86 windows-static-x64 windows-static-x64-posix windows-armv7 \
 	windows-shared-x86 windows-shared-x64 windows-shared-x64-posix windows-arm64
 
@@ -27,7 +28,7 @@ GEN_IMAGES = android-arm android-arm64 \
 	linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl linux-arm64-full \
 	manylinux2014-x64 manylinux2014-x86 \
 	manylinux2014-aarch64 linux-arm64-lts \
-	web-wasm linux-mips windows-arm64 windows-armv7 \
+	web-wasm web-wasi linux-mips windows-arm64 windows-armv7 \
 	windows-static-x86 windows-static-x64 windows-static-x64-posix \
 	windows-shared-x86 windows-shared-x64 windows-shared-x64-posix \
 	linux-armv7 linux-armv7a linux-armv7l-musl linux-x86_64-full \

README.md

@@ -105,7 +105,8 @@ The dockcross script will execute the given command-line inside the container, a
 | dockcross/linux-x86_64-full | x86_64 | GCC + libs | Linux |
 | dockcross/linux-x64-clang | x86_64 | Clang | Linux |
 | dockcross/linux-x64-tinycc | x86_64 | tinycc + GCC | Linux |
-| dockcross/web-wasm | JS | LLVM | Web (JS) |
+| dockcross/web-wasm | Wasm | LLVM | Web (JS) |
+| dockcross/web-wasi | Wasm | LLVM | Web (Universal) |
 | dockcross/windows-shared-x86 | x86 | GCC | Windows |
 | dockcross/windows-shared-x64 | x86_64 | GCC | Windows |
 | dockcross/windows-shared-x64-posix | x86_64 | GCC | Windows |
@@ -315,7 +316,13 @@ Docker [manylinux2014](https://github.com/pypa/manylinux) image for building Lin
 
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/web-wasm/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/web-wasm)
 
-The Emscripten WebAssembly/asm.js/JavaScript cross compiler.
+The [Emscripten](https://emscripten.org/) [WebAssembly](https://webassembly.org/)/JavaScript cross compiler.
+
+### dockcross/web-wasi
+
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/web-wasi/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/web-wasi)
+
+The [WebAssembly System Interface (WASI)](https://wasi.dev/) SDK LLVM/Clang/WASI Sysroot cross compiler.
 
 ### dockcross/windows-static-x64
 

linux-arm64-full/Dockerfile.in

@@ -1,5 +1,7 @@
 FROM dockcross/base:latest
 
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
 # This is for 64-bit ARM Linux machine
 
 # Buildroot version

linux-arm64/Dockerfile.in

@@ -1,5 +1,7 @@
 FROM dockcross/base:latest
 
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
 # This is for 64-bit ARM Linux machine
 
 # Crosstool-ng version

linux-armv5/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 # This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
 # VFP instructions (armhf).

linux-armv6-lts/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL 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)

linux-armv6/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL 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)

linux-armv7/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL 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)

linux-armv7a/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 # This is for 32-bit ARMv7 Linux
 

linux-m68k-uclibc/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL 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)

linux-mips/Dockerfile.in

@@ -1,5 +1,7 @@
 FROM dockcross/base:latest
 
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
 # This is for 32-bit Big-Endian MIPS devices with hard floating point enabled
 
 # Crosstool-ng version

linux-ppc64le/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL 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)

linux-riscv32/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL 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)

linux-riscv64/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL 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)

linux-s390x/Dockerfile.in

@@ -1,5 +1,7 @@
 FROM dockcross/base:latest
 
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
 # This is for 64-bit S390X Linux machine
 
 # Crosstool-ng version

linux-x64-clang/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ARG CLANG_VERSION=13
 ENV CLANG_VERSION=${CLANG_VERSION}

linux-x64-tinycc/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 # This image use Tinycc as C compiler and GCC as C++ compiler
 

linux-x64/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 RUN apt-get update && \
     apt-get -y install \

linux-x86/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 RUN dpkg --add-architecture i386 && \
   apt-get update && apt-get -y install \

linux-x86_64-full/Dockerfile.in

@@ -1,5 +1,7 @@
 FROM dockcross/base:latest
 
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
 # This is for 64-bit x86 Linux machine
 
 # Buildroot version

linux-xtensa-uclibc/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL 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)

manylinux2014-aarch64/Dockerfile.in

@@ -4,6 +4,8 @@
 # For more details, read https://github.com/dockcross/dockcross/issues/367
 FROM dockcross/manylinux2014-x64:20210708-94745ff
 
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
 # This is for 64-bit ARM Manylinux machine
 
 # Crosstool-ng version

manylinux2014-x64/Dockerfile.in

@@ -1,6 +1,7 @@
 # Recent versions address yum functionality
 FROM quay.io/pypa/manylinux2014_x86_64:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2014-x64
 

manylinux2014-x86/Dockerfile.in

@@ -1,6 +1,7 @@
 # Recent versions address yum functionality
 FROM quay.io/pypa/manylinux2014_i686:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2014-x86
 

web-wasi/Dockerfile.in

@@ -0,0 +1,32 @@
+FROM dockcross/base:latest
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+
+# The cross-compiling emulator
+ENV WASMER_DIR /usr/local/wasmer
+RUN curl https://get.wasmer.io -sSfL | sh
+ENV PATH /usr/local/wasmer/bin:${PATH}
+
+ENV WASI_VERSION 12
+ENV WASI_VERSION_FULL ${WASI_VERSION}.0
+RUN cd /usr/ && \
+  curl -L -O https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz && \
+  tar xvzf wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz && \
+  rm wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz
+ENV WASI_SDK_PATH /usr/wasi-sdk-${WASI_VERSION_FULL}
+ENV WASI_SYSROOT ${WASI_SDK_PATH}/share/wasi-sysroot
+
+COPY clang-wasi-sysroot.sh clang++-wasi-sysroot.sh wasmer-pwd.sh /usr/local/bin/
+
+ENV CROSS_TRIPLE=wasm32-wasi
+ENV CROSS_ROOT=${WASI_SDK_PATH}
+ENV ANDROID_NDK=${CROSS_ROOT}
+ENV AR=${CROSS_ROOT}/bin/llvm-ar \
+    CC=clang-wasi-sysroot.sh \
+    CXX=clang++-wasi-sysroot.sh \
+    LD=${CROSS_ROOT}/bin/wasm-ld
+
+COPY Toolchain.cmake ${CROSS_ROOT}/
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
+
+#include "common.label-and-env"

web-wasi/Toolchain.cmake

@@ -0,0 +1,11 @@
+set(WASI 1)
+
+include($ENV{WASI_SDK_PATH}/share/cmake/wasi-sdk.cmake)
+
+set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
+set(CMAKE_SYSROOT $ENV{WASI_SYSROOT})
+
+set(CMAKE_C_COMPILER /usr/local/bin/clang-wasi-sysroot.sh)
+set(CMAKE_CXX_COMPILER /usr/local/bin/clang++-wasi-sysroot.sh)
+
+set(CMAKE_CROSSCOMPILING_EMULATOR /usr/local/bin/wasmer-pwd.sh)

web-wasi/clang++-wasi-sysroot.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+exec ${WASI_SDK_PATH}/bin/clang++ --sysroot=${WASI_SYSROOT} "$@"

web-wasi/clang-wasi-sysroot.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+exec ${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SYSROOT} "$@"

web-wasi/wasmer-pwd.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# Mount the PWD to enable access in try_run commands
+exec /usr/local/wasmer/bin/wasmer run --dir=. --dir=$PWD "$@"

web-wasm/Dockerfile.in

@@ -1,5 +1,6 @@
-FROM emscripten/emsdk:2.0.30
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+FROM emscripten/emsdk:2.0.31
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 # Revert back to "/bin/sh" as default shell
 # See https://github.com/asRIA/emscripten-docker/blob/master/Dockerfile.in#L4
@@ -52,7 +53,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
 
 #include "common.docker"
 
-ENV EMSCRIPTEN_VERSION 2.0.30
+ENV EMSCRIPTEN_VERSION 2.0.31
 
 ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
 ENV CC=/emsdk/upstream/emscripten/emcc \

windows-arm64/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV XCC_PREFIX /usr/xcc
 ENV CROSS_TRIPLE aarch64-w64-mingw32

windows-armv7/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV XCC_PREFIX /usr/xcc
 ENV CROSS_TRIPLE armv7-w64-mingw32

windows-shared-x64-posix/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV WINEARCH win64
 ARG MXE_TARGET_ARCH=x86_64

windows-shared-x64/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV WINEARCH win64
 ARG MXE_TARGET_ARCH=x86_64

windows-shared-x86/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV WINEARCH win32
 ARG MXE_TARGET_ARCH=i686

windows-static-x64-posix/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV WINEARCH win64
 ARG MXE_TARGET_ARCH=x86_64

windows-static-x64/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV WINEARCH win64
 ARG MXE_TARGET_ARCH=x86_64

windows-static-x86/Dockerfile.in

@@ -1,5 +1,6 @@
 FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV WINEARCH win32
 ARG MXE_TARGET_ARCH=i686