From f888b7de0b41d050f5294c8a6a350b4b7d7dfa9e Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Mon, 4 Oct 2021 12:51:28 +0200
Subject: [PATCH 1/9] Replace deprecated label 'MAINTAINER' by 'LABEL
 maintainer'

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
---
 Dockerfile.in                          | 2 +-
 linux-arm64-full/Dockerfile.in         | 2 ++
 linux-arm64/Dockerfile.in              | 2 ++
 linux-armv5/Dockerfile.in              | 3 ++-
 linux-armv6-lts/Dockerfile.in          | 3 ++-
 linux-armv6/Dockerfile.in              | 3 ++-
 linux-armv7/Dockerfile.in              | 3 ++-
 linux-armv7a/Dockerfile.in             | 3 ++-
 linux-m68k-uclibc/Dockerfile.in        | 3 ++-
 linux-mips/Dockerfile.in               | 2 ++
 linux-ppc64le/Dockerfile.in            | 3 ++-
 linux-riscv32/Dockerfile.in            | 3 ++-
 linux-riscv64/Dockerfile.in            | 3 ++-
 linux-s390x/Dockerfile.in              | 2 ++
 linux-x64-clang/Dockerfile.in          | 3 ++-
 linux-x64-tinycc/Dockerfile.in         | 3 ++-
 linux-x64/Dockerfile.in                | 3 ++-
 linux-x86/Dockerfile.in                | 3 ++-
 linux-x86_64-full/Dockerfile.in        | 2 ++
 linux-xtensa-uclibc/Dockerfile.in      | 3 ++-
 manylinux2014-aarch64/Dockerfile.in    | 2 ++
 manylinux2014-x64/Dockerfile.in        | 3 ++-
 manylinux2014-x86/Dockerfile.in        | 3 ++-
 web-wasm/Dockerfile.in                 | 3 ++-
 windows-arm64/Dockerfile.in            | 3 ++-
 windows-armv7/Dockerfile.in            | 3 ++-
 windows-shared-x64-posix/Dockerfile.in | 3 ++-
 windows-shared-x64/Dockerfile.in       | 3 ++-
 windows-shared-x86/Dockerfile.in       | 3 ++-
 windows-static-x64-posix/Dockerfile.in | 3 ++-
 windows-static-x64/Dockerfile.in       | 3 ++-
 windows-static-x86/Dockerfile.in       | 3 ++-
 32 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/Dockerfile.in b/Dockerfile.in
index 44ff99e..c9b082c 100644
--- a/Dockerfile.in
+++ b/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"
 
diff --git a/linux-arm64-full/Dockerfile.in b/linux-arm64-full/Dockerfile.in
index ff78847..1851bfa 100644
--- a/linux-arm64-full/Dockerfile.in
+++ b/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
diff --git a/linux-arm64/Dockerfile.in b/linux-arm64/Dockerfile.in
index bb24f44..a4892ed 100644
--- a/linux-arm64/Dockerfile.in
+++ b/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
diff --git a/linux-armv5/Dockerfile.in b/linux-armv5/Dockerfile.in
index b97f29a..e148ba7 100644
--- a/linux-armv5/Dockerfile.in
+++ b/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).
diff --git a/linux-armv6-lts/Dockerfile.in b/linux-armv6-lts/Dockerfile.in
index 885438c..9832632 100644
--- a/linux-armv6-lts/Dockerfile.in
+++ b/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)
diff --git a/linux-armv6/Dockerfile.in b/linux-armv6/Dockerfile.in
index a75eba4..837f677 100644
--- a/linux-armv6/Dockerfile.in
+++ b/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)
diff --git a/linux-armv7/Dockerfile.in b/linux-armv7/Dockerfile.in
index cd884e2..c73df8b 100644
--- a/linux-armv7/Dockerfile.in
+++ b/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)
diff --git a/linux-armv7a/Dockerfile.in b/linux-armv7a/Dockerfile.in
index ea0098e..68b94a6 100644
--- a/linux-armv7a/Dockerfile.in
+++ b/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
 
diff --git a/linux-m68k-uclibc/Dockerfile.in b/linux-m68k-uclibc/Dockerfile.in
index 8adeb9a..715faa2 100644
--- a/linux-m68k-uclibc/Dockerfile.in
+++ b/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)
diff --git a/linux-mips/Dockerfile.in b/linux-mips/Dockerfile.in
index 90ea378..af8ea6b 100644
--- a/linux-mips/Dockerfile.in
+++ b/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
diff --git a/linux-ppc64le/Dockerfile.in b/linux-ppc64le/Dockerfile.in
index 94b851d..c0129df 100644
--- a/linux-ppc64le/Dockerfile.in
+++ b/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)
diff --git a/linux-riscv32/Dockerfile.in b/linux-riscv32/Dockerfile.in
index b4a9f6e..de82e8b 100644
--- a/linux-riscv32/Dockerfile.in
+++ b/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)
diff --git a/linux-riscv64/Dockerfile.in b/linux-riscv64/Dockerfile.in
index df5e45e..3e28bce 100644
--- a/linux-riscv64/Dockerfile.in
+++ b/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)
diff --git a/linux-s390x/Dockerfile.in b/linux-s390x/Dockerfile.in
index ec9489d..e800b51 100644
--- a/linux-s390x/Dockerfile.in
+++ b/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
diff --git a/linux-x64-clang/Dockerfile.in b/linux-x64-clang/Dockerfile.in
index cf7027e..f9de5d9 100644
--- a/linux-x64-clang/Dockerfile.in
+++ b/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}
diff --git a/linux-x64-tinycc/Dockerfile.in b/linux-x64-tinycc/Dockerfile.in
index 8cc6e6d..78d7906 100644
--- a/linux-x64-tinycc/Dockerfile.in
+++ b/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
 
diff --git a/linux-x64/Dockerfile.in b/linux-x64/Dockerfile.in
index a966bdb..01d8cf1 100644
--- a/linux-x64/Dockerfile.in
+++ b/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 \
diff --git a/linux-x86/Dockerfile.in b/linux-x86/Dockerfile.in
index 96fbdcc..b2da4a5 100644
--- a/linux-x86/Dockerfile.in
+++ b/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 \
diff --git a/linux-x86_64-full/Dockerfile.in b/linux-x86_64-full/Dockerfile.in
index 03d7203..742f80c 100644
--- a/linux-x86_64-full/Dockerfile.in
+++ b/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
diff --git a/linux-xtensa-uclibc/Dockerfile.in b/linux-xtensa-uclibc/Dockerfile.in
index 6cf65b6..83289b5 100644
--- a/linux-xtensa-uclibc/Dockerfile.in
+++ b/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)
diff --git a/manylinux2014-aarch64/Dockerfile.in b/manylinux2014-aarch64/Dockerfile.in
index 3b7dd89..86d11bd 100644
--- a/manylinux2014-aarch64/Dockerfile.in
+++ b/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
diff --git a/manylinux2014-x64/Dockerfile.in b/manylinux2014-x64/Dockerfile.in
index 8bb9633..51e0a15 100644
--- a/manylinux2014-x64/Dockerfile.in
+++ b/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
 
diff --git a/manylinux2014-x86/Dockerfile.in b/manylinux2014-x86/Dockerfile.in
index 6888b20..1716c84 100644
--- a/manylinux2014-x86/Dockerfile.in
+++ b/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
 
diff --git a/web-wasm/Dockerfile.in b/web-wasm/Dockerfile.in
index 85c70eb..33b88d7 100644
--- a/web-wasm/Dockerfile.in
+++ b/web-wasm/Dockerfile.in
@@ -1,5 +1,6 @@
 FROM emscripten/emsdk:2.0.30
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+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
diff --git a/windows-arm64/Dockerfile.in b/windows-arm64/Dockerfile.in
index 3be2fb6..493bf3d 100644
--- a/windows-arm64/Dockerfile.in
+++ b/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
diff --git a/windows-armv7/Dockerfile.in b/windows-armv7/Dockerfile.in
index 6f28818..25d11f6 100644
--- a/windows-armv7/Dockerfile.in
+++ b/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
diff --git a/windows-shared-x64-posix/Dockerfile.in b/windows-shared-x64-posix/Dockerfile.in
index 65503b4..9e42225 100644
--- a/windows-shared-x64-posix/Dockerfile.in
+++ b/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
diff --git a/windows-shared-x64/Dockerfile.in b/windows-shared-x64/Dockerfile.in
index 0d748bd..56f1115 100644
--- a/windows-shared-x64/Dockerfile.in
+++ b/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
diff --git a/windows-shared-x86/Dockerfile.in b/windows-shared-x86/Dockerfile.in
index 1ae43d4..17de0df 100644
--- a/windows-shared-x86/Dockerfile.in
+++ b/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
diff --git a/windows-static-x64-posix/Dockerfile.in b/windows-static-x64-posix/Dockerfile.in
index a9b67d9..513d4ce 100644
--- a/windows-static-x64-posix/Dockerfile.in
+++ b/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
diff --git a/windows-static-x64/Dockerfile.in b/windows-static-x64/Dockerfile.in
index 1c798ac..fe50776 100644
--- a/windows-static-x64/Dockerfile.in
+++ b/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
diff --git a/windows-static-x86/Dockerfile.in b/windows-static-x86/Dockerfile.in
index 15140fe..82df724 100644
--- a/windows-static-x86/Dockerfile.in
+++ b/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

From 3714419c91c91b2146ce931079b8f74b1b3c72ae Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Mon, 4 Oct 2021 17:52:16 +0200
Subject: [PATCH 2/9] Add darknet (Neural Networks) build in CI

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
---
 .github/workflows/main.yml | 96 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d4e6a99..68caed5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -62,6 +62,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "android-arm64",
@@ -77,6 +79,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "android-x86",
@@ -92,6 +96,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "android-x86_64",
@@ -107,6 +113,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Linux arm64/armv8 images
           - {
@@ -123,6 +131,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "linux-arm64-lts",
@@ -138,6 +148,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "linux-arm64-musl",
@@ -153,6 +165,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "linux-arm64-full",
@@ -168,6 +182,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Linux armv5 images
           - {
@@ -184,6 +200,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "linux-armv5-musl",
@@ -199,6 +217,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Linux armv6 images
           - {
@@ -215,6 +235,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "linux-armv6-lts",
@@ -230,6 +252,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "linux-armv6-musl",
@@ -245,6 +269,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Linux armv7 images
           - {
@@ -261,6 +287,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "linux-armv7a",
@@ -276,6 +304,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "linux-armv7l-musl",
@@ -291,6 +321,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Linux x86 images
           - {
@@ -307,6 +339,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Linux x86_64 images
           - {
@@ -323,6 +357,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "linux-x64-tinycc",
@@ -338,6 +374,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "linux-x64-clang",
@@ -353,6 +391,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "linux-x86_64-full",
@@ -368,6 +408,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Linux riscv images
           - {
@@ -384,6 +426,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "linux-riscv64",
@@ -399,6 +443,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Linux s390x images
           - {
@@ -415,6 +461,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Linux mips images
           - {
@@ -431,6 +479,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Linux ppc64le images
           - {
@@ -447,6 +497,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Linux m68k images
           - {
@@ -463,6 +515,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Linux xtensa images
           - {
@@ -479,6 +533,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Windows x86_x64 images
           - {
@@ -495,6 +551,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "windows-static-x64-posix",
@@ -510,6 +568,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "windows-shared-x64",
@@ -525,6 +585,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "windows-shared-x64-posix",
@@ -540,6 +602,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Windows x86 images
           - {
@@ -556,6 +620,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "windows-shared-x86",
@@ -571,6 +637,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # Windows arm images
           - {
@@ -587,6 +655,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "windows-arm64",
@@ -602,6 +672,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # manylinux2014 images
           - {
@@ -618,6 +690,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "manylinux2014-x64",
@@ -633,6 +707,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           - {
               image: "manylinux2014-aarch64",
@@ -648,6 +724,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
           # web-wasm images
           - {
@@ -664,6 +742,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
+              darknet: "yes",
+              darknet_arg: "",
             }
     steps:
       - uses: actions/checkout@v2
@@ -677,6 +757,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 +767,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 +786,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 +796,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 +806,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 +815,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 04/10/2021
+      - name: Darknet build test
+        if: ${{ matrix.arch_name.darknet == 'yes' }}
+        run: |
+          git clone https://github.com/AlexeyAB/darknet.git
+          cd darknet
+          git checkout 568d8c18ab7323b68b16e5844040cd8d779dc7df
+          ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.darknet_arg }}
+          cd ..
+          rm -rf darknet
       - name: deploy
         if: github.ref == 'refs/heads/master'
         run: |

From d7c3c499e900bb250db4892c9b32e07104627fa5 Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Tue, 5 Oct 2021 19:54:20 +0200
Subject: [PATCH 3/9] Add Replace darknet test by cpython

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
---
 .github/workflows/main.yml | 176 ++++++++++++++++++-------------------
 1 file changed, 88 insertions(+), 88 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 68caed5..10c7ea8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -62,8 +62,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "android-arm64",
@@ -79,8 +79,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "android-x86",
@@ -96,8 +96,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "android-x86_64",
@@ -113,8 +113,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux arm64/armv8 images
           - {
@@ -131,8 +131,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-arm64-lts",
@@ -148,8 +148,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-arm64-musl",
@@ -165,8 +165,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-arm64-full",
@@ -182,8 +182,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux armv5 images
           - {
@@ -200,8 +200,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-armv5-musl",
@@ -217,8 +217,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux armv6 images
           - {
@@ -235,8 +235,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-armv6-lts",
@@ -252,8 +252,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-armv6-musl",
@@ -269,8 +269,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux armv7 images
           - {
@@ -287,8 +287,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-armv7a",
@@ -304,8 +304,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-armv7l-musl",
@@ -321,8 +321,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux x86 images
           - {
@@ -339,8 +339,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux x86_64 images
           - {
@@ -357,8 +357,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-x64-tinycc",
@@ -374,8 +374,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-x64-clang",
@@ -391,8 +391,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-x86_64-full",
@@ -408,8 +408,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux riscv images
           - {
@@ -426,8 +426,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "linux-riscv64",
@@ -443,8 +443,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux s390x images
           - {
@@ -461,8 +461,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux mips images
           - {
@@ -479,8 +479,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux ppc64le images
           - {
@@ -497,8 +497,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux m68k images
           - {
@@ -515,8 +515,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Linux xtensa images
           - {
@@ -533,8 +533,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Windows x86_x64 images
           - {
@@ -551,8 +551,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "windows-static-x64-posix",
@@ -568,8 +568,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "windows-shared-x64",
@@ -585,8 +585,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "windows-shared-x64-posix",
@@ -602,8 +602,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Windows x86 images
           - {
@@ -620,8 +620,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "windows-shared-x86",
@@ -637,8 +637,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # Windows arm images
           - {
@@ -655,8 +655,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "windows-arm64",
@@ -672,8 +672,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # manylinux2014 images
           - {
@@ -690,8 +690,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "manylinux2014-x64",
@@ -707,8 +707,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           - {
               image: "manylinux2014-aarch64",
@@ -724,8 +724,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
           # web-wasm images
           - {
@@ -742,8 +742,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              darknet: "yes",
-              darknet_arg: "",
+              cpython: "yes",
+              cpython_arg: "",
             }
     steps:
       - uses: actions/checkout@v2
@@ -815,16 +815,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 04/10/2021
-      - name: Darknet build test
-        if: ${{ matrix.arch_name.darknet == 'yes' }}
+      # Updated on 05/10/2021
+      - name: cpython build test
+        if: ${{ matrix.arch_name.cpython == 'yes' }}
         run: |
-          git clone https://github.com/AlexeyAB/darknet.git
-          cd darknet
-          git checkout 568d8c18ab7323b68b16e5844040cd8d779dc7df
-          ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.darknet_arg }}
+          git clone --depth 1 --branch v3.10.0 https://github.com/python/cpython.git
+          cd cpython
+          ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure ${{ matrix.arch_name.cpython_arg }}
+          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
           cd ..
-          rm -rf darknet
+          rm -rf cpython
       - name: deploy
         if: github.ref == 'refs/heads/master'
         run: |

From 3c233983f6d31359888267ccb1ca1ce8366ee524 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Tue, 5 Oct 2021 06:59:36 -0400
Subject: [PATCH 4/9] web-wasm: Bump Emscripten to 2.0.31

---
 web-wasm/Dockerfile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web-wasm/Dockerfile.in b/web-wasm/Dockerfile.in
index 85c70eb..c705af3 100644
--- a/web-wasm/Dockerfile.in
+++ b/web-wasm/Dockerfile.in
@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.30
+FROM emscripten/emsdk:2.0.31
 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.30
+ENV EMSCRIPTEN_VERSION 2.0.31
 
 ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
 ENV CC=/emsdk/upstream/emscripten/emcc \

From d2931e8635c966b89f588367b3994c1849c95cfd Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Thu, 7 Oct 2021 02:09:30 +0200
Subject: [PATCH 5/9] =?UTF-8?q?Update=20N=C2=B01:=20config=20python?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
---
 .github/workflows/main.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5afc245..59419e6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -63,7 +63,7 @@ jobs:
               fmt: "no",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=arm-linux-androideabi",
             }
           - {
               image: "android-arm64",
@@ -80,7 +80,7 @@ jobs:
               fmt: "no",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=arch64-linux-android",
             }
           - {
               image: "android-x86",
@@ -97,7 +97,7 @@ jobs:
               fmt: "no",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=i686-linux-android",
             }
           - {
               image: "android-x86_64",
@@ -110,7 +110,7 @@ jobs:
               C: "no",
               C_arg: "",
               C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
+              C-Plus-Plus_arg: "--host=x86_64-linux-gnu --build=x86_64-linux-android",
               fmt: "no",
               fmt_arg: "",
               cpython: "yes",
@@ -132,7 +132,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
             }
           - {
               image: "linux-arm64-lts",
@@ -149,7 +149,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
             }
           - {
               image: "linux-arm64-musl",
@@ -166,7 +166,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-linux-musl",
             }
           - {
               image: "linux-arm64-full",
@@ -183,7 +183,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
             }
           # Linux armv5 images
           - {
@@ -201,7 +201,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv5-unknown-linux-musleabi",
             }
           - {
               image: "linux-armv5-musl",
@@ -288,7 +288,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv7-unknown-linux-gnueabi",
             }
           - {
               image: "linux-armv7a",
@@ -305,7 +305,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=arm-cortexa8_neon-linux-gnueabihf",
             }
           - {
               image: "linux-armv7l-musl",
@@ -322,7 +322,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv7l-linux-musleabihf",
             }
           # Linux x86 images
           - {
@@ -427,7 +427,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=riscv32-unknown-linux-gnu",
             }
           - {
               image: "linux-riscv64",
@@ -444,7 +444,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=riscv64-unknown-linux-gnu",
             }
           # Linux s390x images
           - {
@@ -462,7 +462,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=s390x-ibm-linux-gnu",
             }
           # Linux mips images
           - {
@@ -480,7 +480,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=mips-unknown-linux-gnu",
             }
           # Linux ppc64le images
           - {
@@ -498,7 +498,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=powerpc64le-unknown-linux-gnu",
             }
           # Linux m68k images
           - {
@@ -819,9 +819,9 @@ jobs:
       - name: cpython build test
         if: ${{ matrix.arch_name.cpython == 'yes' }}
         run: |
-          git clone --depth 1 --branch v3.10.0 https://github.com/python/cpython.git
+          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 ${{ matrix.arch_name.cpython_arg }}
+          ./../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

From cf8697648e3d29016c02e4186b54ebc9c65ea468 Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Thu, 7 Oct 2021 11:57:01 +0200
Subject: [PATCH 6/9] =?UTF-8?q?Update=20N=C2=B02:=20config=20python?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
---
 .github/workflows/main.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 59419e6..3c7207e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -80,7 +80,7 @@ jobs:
               fmt: "no",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=arch64-linux-android",
+              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-linux-android",
             }
           - {
               image: "android-x86",
@@ -110,11 +110,11 @@ jobs:
               C: "no",
               C_arg: "",
               C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "--host=x86_64-linux-gnu --build=x86_64-linux-android",
+              C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=x86_64-linux-android",
             }
           # Linux arm64/armv8 images
           - {
@@ -201,7 +201,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=armv5-unknown-linux-musleabi",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv5-unknown-linux-gnueabi",
             }
           - {
               image: "linux-armv5-musl",
@@ -218,7 +218,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv5-unknown-linux-musleabi",
             }
           # Linux armv6 images
           - {
@@ -236,7 +236,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv6-unknown-linux-gnueabihf",
             }
           - {
               image: "linux-armv6-lts",
@@ -253,7 +253,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv6-unknown-linux-gnueabihf",
             }
           - {
               image: "linux-armv6-musl",
@@ -270,7 +270,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv6-linux-musleabihf",
             }
           # Linux armv7 images
           - {
@@ -516,7 +516,7 @@ jobs:
               fmt: "no",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=m68k-unknown-uclinux-uclibc",
             }
           # Linux xtensa images
           - {
@@ -534,7 +534,7 @@ jobs:
               fmt: "no",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=xtensa-fsf-linux-uclibc",
             }
           # Windows x86_x64 images
           - {
@@ -551,7 +551,7 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
               cpython_arg: "",
             }
           - {
@@ -568,7 +568,7 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
               cpython_arg: "",
             }
           - {
@@ -585,7 +585,7 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
               cpython_arg: "",
             }
           - {
@@ -602,7 +602,7 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
               cpython_arg: "",
             }
           # Windows x86 images
@@ -620,7 +620,7 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
               cpython_arg: "",
             }
           - {
@@ -637,7 +637,7 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
               cpython_arg: "",
             }
           # Windows arm images
@@ -656,7 +656,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=armv7-w64-mingw32",
             }
           - {
               image: "windows-arm64",
@@ -673,7 +673,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-w64-mingw32",
             }
           # manylinux2014 images
           - {
@@ -742,7 +742,7 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
               cpython_arg: "",
             }
     steps:

From 3c1e95361fa9136a31bae1f6baea9c576ebc79ed Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Thu, 7 Oct 2021 15:07:32 +0200
Subject: [PATCH 7/9] =?UTF-8?q?Update=20N=C2=B03:=20config=20python?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update N°3: config python
---
 .github/workflows/main.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3c7207e..7070b90 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -374,7 +374,7 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
               cpython_arg: "",
             }
           - {
@@ -391,7 +391,7 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
               cpython_arg: "",
             }
           - {
@@ -515,7 +515,7 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
               cpython_arg: "--host=x86_64-linux-gnu --build=m68k-unknown-uclinux-uclibc",
             }
           # Linux xtensa images
@@ -655,8 +655,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=armv7-w64-mingw32",
+              cpython: "no",
+              cpython_arg: "",
             }
           - {
               image: "windows-arm64",
@@ -672,8 +672,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-w64-mingw32",
+              cpython: "no",
+              cpython_arg: "",
             }
           # manylinux2014 images
           - {

From f2e6df0bc9dc0eb7ac58c1c6be37c77da6a50a7a Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Thu, 7 Oct 2021 19:40:07 +0200
Subject: [PATCH 8/9] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7070b90..1578a94 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -409,7 +409,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "",
+              cpython_arg: "--host=x86_64-linux-gnu --build=x86_64-buildroot-linux-gnu",
             }
           # Linux riscv images
           - {

From b1bfb861d8ec7e136df71df32f9840035049ec3c Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Fri, 8 Oct 2021 17:07:09 -0400
Subject: [PATCH 9/9] web-wasi: Initial addition

---
 .github/workflows/main.yml       | 17 +++++++++++++++++
 Makefile                         |  3 ++-
 README.md                        | 11 +++++++++--
 web-wasi/Dockerfile.in           | 32 ++++++++++++++++++++++++++++++++
 web-wasi/Toolchain.cmake         | 11 +++++++++++
 web-wasi/clang++-wasi-sysroot.sh |  3 +++
 web-wasi/clang-wasi-sysroot.sh   |  3 +++
 web-wasi/wasmer-pwd.sh           |  4 ++++
 8 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 web-wasi/Dockerfile.in
 create mode 100644 web-wasi/Toolchain.cmake
 create mode 100755 web-wasi/clang++-wasi-sysroot.sh
 create mode 100755 web-wasi/clang-wasi-sysroot.sh
 create mode 100755 web-wasi/wasmer-pwd.sh

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1578a94..68d6d99 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -745,6 +745,23 @@ jobs:
               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
       - uses: actions/download-artifact@v2
diff --git a/Makefile b/Makefile
index e210337..4b0ba78 100644
--- a/Makefile
+++ b/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 \
diff --git a/README.md b/README.md
index 61752cf..714cf02 100644
--- a/README.md
+++ b/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
 
diff --git a/web-wasi/Dockerfile.in b/web-wasi/Dockerfile.in
new file mode 100644
index 0000000..3399f44
--- /dev/null
+++ b/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"
diff --git a/web-wasi/Toolchain.cmake b/web-wasi/Toolchain.cmake
new file mode 100644
index 0000000..bd75c38
--- /dev/null
+++ b/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)
diff --git a/web-wasi/clang++-wasi-sysroot.sh b/web-wasi/clang++-wasi-sysroot.sh
new file mode 100755
index 0000000..e95fefc
--- /dev/null
+++ b/web-wasi/clang++-wasi-sysroot.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+exec ${WASI_SDK_PATH}/bin/clang++ --sysroot=${WASI_SYSROOT} "$@"
diff --git a/web-wasi/clang-wasi-sysroot.sh b/web-wasi/clang-wasi-sysroot.sh
new file mode 100755
index 0000000..7c3586c
--- /dev/null
+++ b/web-wasi/clang-wasi-sysroot.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+exec ${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SYSROOT} "$@"
diff --git a/web-wasi/wasmer-pwd.sh b/web-wasi/wasmer-pwd.sh
new file mode 100755
index 0000000..4677ae8
--- /dev/null
+++ b/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 "$@"