Merge branch 'master' into add_xtenda

.github/workflows/expired.yml

@@ -9,8 +9,8 @@ jobs:
       - uses: actions/stale@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          exempt-issue-milestones: 'future,alpha,beta,release,bugfix,improvement,enhancement,help wanted'
-          exempt-pr-milestones: 'bugfix,improvement,enhancement,help wanted'
+          exempt-issue-milestones: 'future,alpha,beta,release'
+          exempt-pr-milestones: 'bugfix,improvement'
           exempt-all-pr-assignees: true
           stale-issue-message: 'This issue is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
           stale-pr-message: 'This PR is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 30 days.'

.github/workflows/main.yml

@@ -5,12 +5,12 @@ on:
     branches:
     - '*'
     paths-ignore:
-      - '**.md'
+      - '**/README.md'
   pull_request:
     branches:
     - '*'
     paths-ignore:
-      - '**.md'
+      - '**/README.md'
   workflow_dispatch:
 
 jobs:
@@ -48,14 +48,14 @@ jobs:
       matrix:
         arch_name: [android-arm, android-arm64, android-x86, android-x86_64, 
           linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, 
-          linux-armv6, linux-armv6-lts, linux-armv6-musl, linux-arm64-full, 
+          linux-armv6, linux-armv6-lts, linux-armv6-musl, 
           linux-armv7, linux-armv7a, linux-armv7l-musl, 
-          linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-x86_64-full,
+          linux-x64-clang, linux-s390x, linux-x64, linux-x86, 
           linux-mips, linux-ppc64le, web-wasm,
-          manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64,
-          windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-armv7,
-          windows-shared-x64, windows-shared-x64-posix, windows-shared-x86, windows-arm64, 
-          linux-riscv64, linux-riscv32, linux-m68k-uclibc, linux-xtensa-uclibc, linux-x64-tinycc]
+          manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, 
+          windows-static-x64, windows-static-x64-posix, windows-static-x86, 
+          windows-shared-x64, windows-shared-x64-posix, windows-shared-x86, 
+          linux-riscv64, linux-riscv32, linux-m68k-uclibc, linux-xtensa-uclibc]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2

.github/workflows/shellcheck.yml

@@ -5,12 +5,12 @@ on:
     branches:
     - '*'
     paths-ignore:
-      - '**.md'
+      - '**/README.md'
   pull_request:
     branches:
     - '*'
     paths-ignore:
-      - '**.md'
+      - '**/README.md'
   workflow_dispatch:
 
 jobs:

Makefile

@@ -14,35 +14,34 @@ BIN = ./bin
 
 # These images are built using the "build implicit rule"
 STANDARD_IMAGES = android-arm android-arm64 android-x86 android-x86_64 \
-	linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl linux-arm64-full \
-	linux-armv5 linux-armv5-musl linux-m68k-uclibc linux-s390x linux-x64-tinycc \
+	linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl \
+	linux-armv5 linux-armv5-musl linux-m68k-uclibc linux-s390x \
 	linux-armv6 linux-armv6-lts linux-armv6-musl \
-	linux-armv7l-musl linux-armv7 linux-armv7a linux-x86_64-full \
+	linux-armv7l-musl linux-armv7 linux-armv7a \
 	linux-mips linux-ppc64le linux-riscv64 linux-riscv32 linux-xtensa-uclibc \
-	windows-static-x86 windows-static-x64 windows-static-x64-posix windows-armv7 \
-	windows-shared-x86 windows-shared-x64 windows-shared-x64-posix windows-arm64
+	windows-static-x86 windows-static-x64 windows-static-x64-posix \
+	windows-shared-x86 windows-shared-x64 windows-shared-x64-posix
 
 # Generated Dockerfiles.
 GEN_IMAGES = android-arm android-arm64 \
-	linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl linux-arm64-full \
+	linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl \
 	manylinux2014-x64 manylinux2014-x86 \
-	manylinux2014-aarch64 \
-	web-wasm linux-mips windows-arm64 windows-armv7 \
+	manylinux2014-aarch64 web-wasm linux-mips \
 	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 \
+	linux-armv7 linux-armv7a linux-armv7l-musl \
 	linux-armv6 linux-armv6-lts linux-armv6-musl \
 	linux-armv5 linux-armv5-musl linux-ppc64le linux-s390x \
-	linux-riscv64 linux-riscv32 linux-m68k-uclibc linux-x64-tinycc linux-xtensa-uclibc
+	linux-riscv64 linux-riscv32 linux-m68k-uclibc linux-xtensa-uclibc
 
 GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
 
 # These images are expected to have explicit rules for *both* build and testing
 NON_STANDARD_IMAGES = manylinux2014-x64 manylinux2014-x86 \
-		      manylinux2014-aarch64 web-wasm
+	manylinux2014-aarch64 web-wasm
 
 # Docker composite files
-DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.buildroot \
+DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux \
 	common.crosstool common.windows common-manylinux.crosstool common.dockcross common.label-and-env
 DOCKER_COMPOSITE_FOLDER_PATH = common/
 DOCKER_COMPOSITE_PATH = $(addprefix $(DOCKER_COMPOSITE_FOLDER_PATH),$(DOCKER_COMPOSITE_SOURCES))
@@ -95,7 +94,6 @@ $(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOS
 		-e '/common.debian/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.debian' \
 		-e '/common.manylinux/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux' \
 		-e '/common.crosstool/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.crosstool' \
-		-e '/common.buildroot/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.buildroot' \
 		-e '/common-manylinux.crosstool/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common-manylinux.crosstool' \
 		-e '/common.windows/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.windows' \
 		-e '/common.dockcross/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.dockcross' \
@@ -128,10 +126,6 @@ web-wasm.test: web-wasm
 # manylinux2014-aarch64
 #
 manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile
-	@# Register qemu
-	docker run --rm --privileged hypriot/qemu-register
-	@# Get libstdc++ from quay.io/pypa/manylinux2014_aarch64 container
-	docker run -v `pwd`:/host --rm -e LIB_PATH=/host/$@/xc_script/ quay.io/pypa/manylinux2014_aarch64 bash -c "PASS=1 /host/$@/xc_script/docker_setup_scrpits/copy_libstd.sh"
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:latest \
 		-t $(ORG)/manylinux2014-aarch64:$(TAG) \
@@ -141,8 +135,6 @@ manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux2014-aarch64/Dockerfile .
 	rm -rf $@/imagefiles
-	@# libstdc++ is coppied into image, now remove it
-	docker run -v `pwd`:/host --rm quay.io/pypa/manylinux2014_aarch64 bash -c "rm -rf /host/$@/xc_script/usr"
 
 manylinux2014-aarch64.test: manylinux2014-aarch64
 	$(DOCKER) run $(RM) $(ORG)/manylinux2014-aarch64 > $(BIN)/dockcross-manylinux2014-aarch64 \
@@ -234,7 +226,7 @@ purge: clean
 # Check bash syntax
 bash-check:
 	find . -type f \( -name "*.sh" -o -name "*.bash" \) -print0 | xargs -0 -P"$(shell nproc)" -I{} \
-		$(SHELLCHECK) --check-sourced --color=auto --format=gcc --severity=warning --shell=bash --enable=all "{}"
+		$(SHELLCHECK) --check-sourced --color=auto --format=gcc --severity=error --shell=bash --enable=all "{}"
 
 #
 # testing implicit rule

README.md

@@ -1,375 +1,335 @@
 
 # dockcross
 
+
 Cross compiling toolchains in Docker images.
 
-[![image](https://github.com/dockcross/dockcross/workflows/Dockcross%20CI/badge.svg)](https://github.com/dockcross/dockcross/actions?query=branch%3Amaster) [![Shellcheck CI](https://github.com/dockcross/dockcross/actions/workflows/shellcheck.yml/badge.svg)](https://github.com/dockcross/dockcross/actions/workflows/shellcheck.yml)
-
-![GitHub](https://img.shields.io/github/license/dockcross/dockcross) ![GitHub commit activity](https://img.shields.io/github/commit-activity/y/dockcross/dockcross)
+[![image](https://github.com/dockcross/dockcross/workflows/Dockcross%20CI/badge.svg)](https://github.com/dockcross/dockcross/actions?query=branch%3Amaster)
 
 ## Features
 
 -   Pre-built and configured toolchains for cross compiling.
 -   Most images also contain an emulator for the target system.
 -   Clean separation of build tools, source code, and build artifacts.
--   Commands in the container are run as the calling user, so that any created files have the expected ownership, (i.e. not root).
--   Make variables **CC**, **CXX**, **LD**, **AS** etc) are set to point to the appropriate tools in the container.
+-   Commands in the container are run as the calling user, so that any
+    created files have the expected ownership, (i.e. not root).
+-   Make variables ([CC]{.title-ref}, [LD]{.title-ref} etc) are set to
+    point to the appropriate tools in the container.
 -   Recent [CMake](https://cmake.org) and ninja are precompiled.
 -   [Conan.io](https://www.conan.io) can be used as a package manager.
 -   Toolchain files configured for CMake.
 -   Current directory is mounted as the container\'s workdir, `/work`.
--   Works with the [Docker for Mac](https://docs.docker.com/docker-for-mac/) and [Docker for Windows](https://docs.docker.com/docker-for-windows/).
--   Support using alternative container executor by setting **OCI_EXE** environment variable. By default, it searches for [docker](https://www.docker.com) and [podman](https://podman.io) executable.
--   [crosstool-ng](https://github.com/crosstool-ng/crosstool-ng) and [buildroot](https://github.com/buildroot/buildroot) configuration files.
+-   Works with the [Docker for
+    Mac](https://docs.docker.com/docker-for-mac/) and [Docker for
+    Windows](https://docs.docker.com/docker-for-windows/).
+-   Support using alternative container executor by setting
+    [OCI_EXE]{.title-ref} environment variable. By default, it searches
+    for [docker]{.title-ref} and
+    \[[podman]{.title-ref}\](<https://podman.io/>) executable.
 
 ## Examples
 
 1.  `dockcross make`: Build the *Makefile* in the current directory.
-2.  `dockcross cmake -Bbuild -H. -GNinja`: Run CMake with a build directory `./build` for a *CMakeLists.txt* file in the current directory and generate `ninja` build configuration files.
+2.  `dockcross cmake -Bbuild -H. -GNinja`: Run CMake with a build
+    directory `./build` for a *CMakeLists.txt* file in the current
+    directory and generate `ninja` build configuration files.
 3.  `dockcross ninja -Cbuild`: Run ninja in the `./build` directory.
-4.  `dockcross bash -c '$CC test/C/hello.c -o hello'`: Build the *hello.c* file with the compiler identified with the `CC` environmental variable in the build environment.
+4.  `dockcross bash -c '$CC test/C/hello.c -o hello'`: Build the
+    *hello.c* file with the compiler identified with the `CC`
+    environmental variable in the build environment.
 5.  `dockcross bash`: Run an interactive shell in the build environment.
 
-Note that commands are executed verbatim. If any shell processing for environment variable expansion or redirection is required, please use
-```bash
-bash -c "<command args>"
-```
+Note that commands are executed verbatim. If any shell processing for
+environment variable expansion or redirection is required, please use
+[bash -c \'command args\...\']{.title-ref}.
 
 ## Installation
 
-This image does not need to be run manually. Instead, there is a helper script to execute build commands on source code existing on the local host filesystem. This script is bundled with the image.
+This image does not need to be run manually. Instead, there is a helper
+script to execute build commands on source code existing on the local
+host filesystem. This script is bundled with the image.
 
-To install the helper script, run one of the images with no arguments, and redirect the output to a file:
+To install the helper script, run one of the images with no arguments,
+and redirect the output to a file:
 
-```bash
-docker run --rm CROSS_COMPILER_IMAGE_NAME > ./dockcross
-chmod +x ./dockcross
-mv ./dockcross ~/bin/
-```
+    docker run --rm CROSS_COMPILER_IMAGE_NAME > ./dockcross
+    chmod +x ./dockcross
+    mv ./dockcross ~/bin/
 
-Where **CROSS_COMPILER_IMAGE_NAME** is the name of the cross-compiler toolchain Docker instance, e.g: **dockcross/linux-armv7**.
+Where [CROSS_COMPILER_IMAGE_NAME]{.title-ref} is the name of the
+cross-compiler toolchain Docker instance, e.g.
+[dockcross/linux-armv7]{.title-ref}.
 
-Only 64-bit x86_64 images are provided, a 64-bit x86_64 host system is required.
+Only 64-bit x86_64 images are provided; a 64-bit x86_64 host system is
+required.
 
 ## Usage
 
 For the impatient, here\'s how to compile a hello world for armv7:
 
-```bash
-cd ~/src/dockcross
-docker run --rm dockcross/linux-armv7 > ./dockcross-linux-armv7
-chmod +x ./dockcross-linux-armv7
-./dockcross-linux-armv7 bash -c '$CC test/C/hello.c -o hello_arm'
-```
+    cd ~/src/dockcross
+    docker run --rm dockcross/linux-armv7 > ./dockcross-linux-armv7
+    chmod +x ./dockcross-linux-armv7
+    ./dockcross-linux-armv7 bash -c '$CC test/C/hello.c -o hello_arm'
 
-Note how invoking any toolchain command (make, gcc, etc.) is just a matter of prepending the **dockcross** script on the commandline:
+Note how invoking any toolchain command (make, gcc, etc.) is just a
+matter of prepending the **dockcross** script on the commandline:
 
-```bash
-./dockcross-linux-armv7 [command] [args...]
-```
+    ./dockcross-linux-armv7 [command] [args...]
 
-The dockcross script will execute the given command-line inside the container, along with all arguments passed after the command. Commands that evaluate environmental variables in the image, like **$CC** or **$CXX** above, should be executed in [bash -c]. The present working directory is mounted within the image, which can be used to make source code available in the Docker container.
-
-## Summary cross compilers
-
-| Image name | Target arch | Compiler | Target OS |
-|:-------:|:--------:|:------:|:-----:|
-| dockcross/base | - | - | - |
-| dockcross/android-arm | ARMv7 | Clang | Android |
-| dockcross/android-arm64 | ARMv8 | Clang | Android |
-| dockcross/android-x86 | x86 | Clang | Android |
-| dockcross/android-x86_64 | x86_64 | Clang | Android |
-| dockcross/linux-arm64 | ARMv8 | GCC | Linux |
-| dockcross/linux-arm64-full | ARMv8 | GCC + libs | Linux |
-| dockcross/linux-arm64-musl | ARMv8 | GCC + musl | Linux |
-| dockcross/linux-armv5 | ARMv5 | GCC | Linux |
-| dockcross/linux-armv5-musl | ARMv5 | GCC + musl | Linux |
-| dockcross/linux-armv6 | ARMv6 | GCC | Linux |
-| dockcross/linux-armv6-lts | ARMv6 | GCC + Glibc 2.28 | Linux |
-| dockcross/linux-armv6-musl | ARMv6 | GCC + musl | Linux |
-| dockcross/linux-armv7 | ARMv7 | GCC | Linux |
-| dockcross/linux-armv7a | ARMv7a | GCC | Linux |
-| dockcross/linux-armv7l-musl | ARMv7l | GCC + musl | Linux |
-| dockcross/linux-mips | mips | GCC | Linux |
-| dockcross/linux-s390x | s390x | GCC | Linux |
-| dockcross/linux-ppc64le | ppc64le | GCC | Linux |
-| dockcross/linux-riscv32 | riscv32 | GCC | Linux |
-| dockcross/linux-riscv64 | riscv64 | GCC | Linux |
-| dockcross/linux-m68k-uclibc | m68k | GCC + uclibc | Linux |
-| dockcross/linux-xtensa-uclibc | xtensa | GCC + uclibc | Linux |
-| dockcross/manylinux2014-x86 | x86 | GCC | Linux |
-| dockcross/manylinux2014-x64 | x86_64 | GCC | Linux |
-| dockcross/linux-x86 | x86 | GCC | Linux |
-| dockcross/linux-x64 | x86_64 | GCC | Linux |
-| dockcross/linux-x64-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/windows-shared-x86 | x86 | GCC | Windows |
-| dockcross/windows-shared-x64 | x86_64 | GCC | Windows |
-| dockcross/windows-shared-x64-posix | x86_64 | GCC | Windows |
-| dockcross/windows-static-x86 | x86 | GCC | Windows |
-| dockcross/windows-static-x64 | x86_64 | GCC | Windows |
-| dockcross/windows-static-x64-posix | x86_64 | GCC | Windows |
-| dockcross/windows-armv7 | ARMv7 | Clang | Windows |
-| dockcross/windows-arm64 | ARMv8 | Clang | Windows |
+The dockcross script will execute the given command-line inside the
+container, along with all arguments passed after the command. Commands
+that evaluate environmental variables in the image, like
+[\$CC]{.title-ref} above, should be executed in [bash -c].
+The present working directory is mounted within the image, which can be
+used to make source code available in the Docker container.
 
 ## Cross compilers
 
 ### dockcross/base
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/base/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/base) ![Docker Stars](https://img.shields.io/docker/stars/dockcross/base)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/base/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/base/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/base) ![Docker Stars](https://img.shields.io/docker/stars/dockcross/base)
 
-Base image for other toolchain images. From Debian Jessie with GCC, make, autotools, CMake, Ninja, Git, and Python.
+Base image for other toolchain images. From Debian Jessie with GCC,
+make, autotools, CMake, Ninja, Git, and Python.
 
 ### dockcross/android-arm
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/android-arm/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/android-arm)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/android-arm/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/android-arm/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/android-arm)
 
 The Android NDK standalone toolchain for the arm architecture.
 
 ### dockcross/android-arm64
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/android-arm64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/android-arm64)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/android-arm64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/android-arm64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/android-arm64)
 
 The Android NDK standalone toolchain for the arm64 architecture.
 
 ### dockcross/android-x86
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/android-x86/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/android-x86)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/android-x86/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/android-x86/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/android-x86)
 
 The Android NDK standalone toolchain for the x86 architecture.
 
 ### dockcross/android-x86_64
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/android-x86_64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/android-x86_64)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/android-x86_64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/android-x86_64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/android-x86_64)
 
 The Android NDK standalone toolchain for the x86_64 architecture.
 
 ### dockcross/linux-arm64
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-arm64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-arm64)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-arm64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-arm64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-arm64)
 
-Cross compiler for the 64-bit ARM platform on Linux, also known as AArch64.
-
-### dockcross/linux-arm64-full
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-arm64-full/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-arm64-full)
-
-Cross compiler for the 64-bit ARM platform on Linux, with cross-libs: SDL2, OpenSSL, Boost, OpenCV and Qt5 (minimal).
+Cross compiler for the 64-bit ARM platform on Linux, also known as
+AArch64.
 
 ### dockcross/linux-arm64-musl
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-arm64-musl/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-arm64-musl)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-arm64-musl/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-arm64-musl/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-arm64-musl)
 
 Cross compiler for the 64-bit ARM platform on Linux (also known as
 AArch64), using [musl](https://www.musl-libc.org/) as base \"libc\".
 
 ### dockcross/linux-armv5
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv5/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv5)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv5/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv5/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv5)
 
 Linux armv5 cross compiler toolchain for legacy devices like the
 Parrot AR Drone.
 
 ### dockcross/linux-armv5-musl
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv5-musl/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv5-musl)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv5-musl/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv5-musl/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv5-musl)
 
 Linux armv5 cross compiler toolchain using
 [musl](https://www.musl-libc.org/) as base \"libc\".
 
 ### dockcross/linux-armv6
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv6/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv6)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv6/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv6/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv6)
 
 Linux ARMv6 cross compiler toolchain for the Raspberry Pi
 
 ### dockcross/linux-armv6-lts
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv6-lts/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv6-lts)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv6-lts/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv6-lts/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv6-lts)
 
 Linux ARMv6 cross compiler toolchain for the Raspberry Pi (Debian buster...)
 
 ### dockcross/linux-armv6-musl
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv6-musl/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv6-musl)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv6-musl/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv6-musl/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv6-musl)
 
 Linux ARMv6 cross compiler toolchain for the Raspberry Pi, etc,
 using [musl](https://www.musl-libc.org/) as base \"libc\".
 
 ### dockcross/linux-armv7
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv7/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv7)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv7/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv7/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv7)
 
 Generic Linux armv7 cross compiler toolchain.
 
 ### dockcross/linux-armv7a
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv7a/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv7a)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv7a/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv7a/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv7a)
 
 Toolchain configured for ARMv7-A used in Beaglebone Black single
 board PC with TI SoC AM3358 on board, Cortex-A8.
 
 ### dockcross/linux-armv7l-musl
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv7l-musl/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv7l-musl)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv7l-musl/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv7l-musl/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv7l-musl)
 
 Toolchain configured for ARMv7-L, using
 [musl](https://www.musl-libc.org/) as base \"libc\".
 
+### dockcross/linux-mipsel
+
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-mipsel/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-mipsel/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-mipsel)
+
+Linux mipsel cross compiler toolchain for little endian MIPS GNU
+systems.
+
 ### dockcross/linux-mips
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-mips/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-mips)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-mips/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-mips/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-mips)
 
 Linux mips cross compiler toolchain for big endian 32-bit hard float
 MIPS GNU systems.
 
 ### dockcross/linux-s390x
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-s390x/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-s390x)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-s390x/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-s390x/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-s390x)
 
 Linux s390x cross compiler toolchain for S390X GNU systems.
 
 ### dockcross/linux-riscv64
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-riscv64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-riscv64)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-riscv64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-riscv64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-riscv64)
 
 Linux risc-v 64bit cross compiler toolchain for risc-v 64bit GNU systems.
 
 ### dockcross/linux-riscv32
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-riscv32/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-riscv32)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-riscv32/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-riscv32/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-riscv32)
 
 Linux risc-v 32bit cross compiler toolchain for risc-v 32bit GNU systems.
 
 ### dockcross/linux-m68k-uclibc
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-m68k-uclibc/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-m68k-uclibc)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-m68k-uclibc/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-m68k-uclibc/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-m68k-uclibc)
 
 Linux m68k cross compiler toolchain for m68k GNU systems (http://www.mac.linux-m68k.org/ and http://www.linux-m68k.org/).
 
 ### dockcross/linux-ppc64le
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-ppc64le/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-ppc64le)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-ppc64le/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-ppc64le/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-ppc64le)
 
-Linux PowerPC 64 little endian cross compiler toolchain for the POWER8, etc. Important: Due to Issue #430, automatic build of newer images has been disabled.
+Linux PowerPC 64 little endian cross compiler toolchain for the
+POWER8, etc. Important: Due to Issue #430, automatic build of newer
+images has been disabled.
 
 ### dockcross/linux-x64
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-x64)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-x64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-x64)
 
-Linux x86_64/amd64 compiler. Since the Docker image is natively x86_64, this is not actually a cross compiler.
-
-### dockcross/linux-x86_64-full
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-x86_64-full/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-x86_64-full)
-
-Linux x86_64/amd64 compiler with libs: SDL2, OpenSSL, Boost, OpenCV and Qt5 (minimal).
+Linux x86_64 / amd64 compiler. Since the Docker image is natively
+x86_64, this is not actually a cross compiler.
 
 ### dockcross/linux-x64-clang
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-x64-clang/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-x64-clang)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-x64-clang/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-x64-clang/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-x64-clang)
 
-Linux clang x86_64/amd64 compiler. Since the Docker image is natively x86_64, this is not actually a cross compiler.
+Linux clang x86_64 / amd64 compiler. Since the Docker image is
+natively x86_64, this is not actually a cross compiler.
 
 ### dockcross/linux-x86
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-x86/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-x86)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-x86/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-x86/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-x86)
 
 Linux i686 cross compiler.
 
-### dockcross/linux-x64-tinycc
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-x64-tinycc/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-x64-tinycc)
-
-Linux tcc compiler for C compiler, and GCC for C++ compiler, for linux x86_64/amd64 arch.
-
 ### dockcross/manylinux2014-x64
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux2014-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux2014-x64)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux2014-x64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/manylinux2014-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux2014-x64)
 
-Docker [manylinux2014](https://github.com/pypa/manylinux) image for building Linux x86_64 / amd64 [Python wheel packages](http://pythonwheels.com/). It includes Python 3.5, 3.6, 3.7, 3.8, and 3.9. Also has support for the dockcross script, and it has installations of CMake, Ninja, and [scikit-build](http://scikit-build.org). For CMake, it sets **MANYLINUX2014** to \"TRUE\" in the toolchain.
+Docker [manylinux2014](https://github.com/pypa/manylinux) image for
+building Linux x86_64 / amd64 [Python wheel
+packages](http://pythonwheels.com/). It includes Python 3.5, 3.6,
+3.7, 3.8, and 3.9. Also has support for the dockcross script, and it
+has installations of CMake, Ninja, and
+[scikit-build](http://scikit-build.org). For CMake, it sets
+[MANYLINUX2014]{.title-ref} to \"TRUE\" in the toolchain.
 
 ### dockcross/manylinux2014-x86
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux2014-x86/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux2014-x86)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux2014-x86/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/manylinux2014-x86/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux2014-x86)
 
-Docker [manylinux2014](https://github.com/pypa/manylinux) image for building Linux i686 [Python wheel packages](http://pythonwheels.com/). It includes Python 3.5, 3.6, 3.7, 3.8, and 3.9. Also has support for the dockcross script, and it has installations of CMake, Ninja, and [scikit-build](http://scikit-build.org). For CMake, it sets **MANYLINUX2014** to \"TRUE\" in the toolchain.
+Docker [manylinux2014](https://github.com/pypa/manylinux) image for
+building Linux i686 [Python wheel
+packages](http://pythonwheels.com/). It includes Python 3.5, 3.6,
+3.7, 3.8, and 3.9. Also has support for the dockcross script, and it
+has installations of CMake, Ninja, and
+[scikit-build](http://scikit-build.org). For CMake, it sets
+[MANYLINUX2014]{.title-ref} to \"TRUE\" in the toolchain.
 
 ### dockcross/manylinux2014-aarch64
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux2014-aarch64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux2014-aarch64)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux2014-aarch64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/manylinux2014-aarch64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux2014-aarch64)
 
-Docker [manylinux2014](https://github.com/pypa/manylinux) image for building Linux aarch64 / arm64 [Python wheel packages](http://pythonwheels.com/). It includes Python 3.5, 3.6, 3.7, 3.8, and 3.9. Also has support for the dockcross script, and it has installations of CMake, Ninja, and [scikit-build](http://scikit-build.org). For CMake, it sets **MANYLINUX2014** to \"TRUE\" in the toolchain.
+Docker [manylinux2014](https://github.com/pypa/manylinux) image for
+building Linux aarch64 / arm64 [Python wheel
+packages](http://pythonwheels.com/). It includes Python 3.5, 3.6,
+3.7, 3.8, and 3.9. Also has support for the dockcross script, and it
+has installations of CMake, Ninja, and
+[scikit-build](http://scikit-build.org). For CMake, it sets
+[MANYLINUX2014]{.title-ref} to \"TRUE\" in the toolchain.
 
 ### dockcross/web-wasm
 
-![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)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/web-wasm/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/web-wasm/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/web-wasm)
 
 The Emscripten WebAssembly/asm.js/JavaScript cross compiler.
 
 ### dockcross/windows-static-x64
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-static-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-static-x64)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-static-x64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/windows-static-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-static-x64)
 
 64-bit Windows cross-compiler based on [MXE/MinGW-w64](https://mxe.cc/) with win32 threads and static
 linking.
 
 ### dockcross/windows-static-x64-posix
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-static-x64-posix/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-static-x64-posix)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-static-x64-posix/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/windows-static-x64-posix/latest)  ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-static-x64-posix)
 
 64-bit Windows cross-compiler based on [MXE/MinGW-w64](https://mxe.cc/) with posix threads and static
 linking.
 
 ### dockcross/windows-static-x86
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-static-x86/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-static-x86)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-static-x86/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/windows-static-x86/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-static-x86)
 
 32-bit Windows cross-compiler based on [MXE/MinGW-w64](https://mxe.cc/) with win32 threads and static linking.
 
 ### dockcross/windows-shared-x64
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-shared-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-shared-x64)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-shared-x64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/windows-shared-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-shared-x64)
 
 64-bit Windows cross-compiler based on [MXE/MinGW-w64](https://mxe.cc/) with win32 threads and dynamic linking.
 
 ### dockcross/windows-shared-x64-posix
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-shared-x64-posix/latest)  ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-shared-x64-posix)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-shared-x64-posix/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/windows-shared-x64-posix/latest)  ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-shared-x64-posix)
 
 64-bit Windows cross-compiler based on [MXE/MinGW-w64](https://mxe.cc/) with posix threads and dynamic linking.
 
 ### dockcross/windows-shared-x86
 
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-shared-x86/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-shared-x86)
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-shared-x86/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/windows-shared-x86/latest)   ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-shared-x86)
 
 32-bit Windows cross-compiler based on [MXE/MinGW-w64](https://mxe.cc/) with win32 threads and dynamic linking.
 
-### dockcross/windows-armv7
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-armv7/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-armv7)
-
-ARMv7 32-bit Windows cross-compiler based on [LLVM/MinGW-w64](https://github.com/mstorsjo/llvm-mingw)
-
-### dockcross/windows-arm64
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/windows-arm64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/windows-arm64)
-
-ARMv8 64-bit Windows cross-compiler based on [llvm-mingw](https://github.com/mstorsjo/llvm-mingw)
-
-## Summary legacy cross compilers
-
-The list of docker images that are no longer supported or broken
-
-| Image name | Target arch | Compiler | Target OS |
-|:-------:|:--------:|:------:|:-----:|
-| dockcross/manylinux1-x86 | x86 | GCC | manylinux |
-| dockcross/manylinux1-x64 | x86_64 | GCC| manylinux |
-| dockcross/manylinux2010-x86 | x86 | GCC | manylinux |
-| dockcross/manylinux2010-x64 | x86_64 | GCC | manylinux |
-
 ## Articles
 
 -   [dockcross: C++ Write Once, Run
@@ -396,13 +356,12 @@ cross-compiler Docker image or the dockcross script itself.
 
 To easily download all images, the convenience target `display_images`
 could be used:
-```bash
-curl https://raw.githubusercontent.com/dockcross/dockcross/master/Makefile -o dockcross-Makefile
-for image in $(make -f dockcross-Makefile display_images); do
-  echo "Pulling dockcross/$image"
-  docker pull dockcross/$image
-done
-```
+
+    curl https://raw.githubusercontent.com/dockcross/dockcross/master/Makefile -o dockcross-Makefile
+    for image in $(make -f dockcross-Makefile display_images); do
+      echo "Pulling dockcross/$image"
+      docker pull dockcross/$image
+    done
 
 ## Install all dockcross scripts
 
@@ -410,18 +369,16 @@ To automatically install in `~/bin` the dockcross scripts for each
 images already downloaded, the convenience target `display_images` could
 be used:
 
-```bash
-curl https://raw.githubusercontent.com/dockcross/dockcross/master/Makefile -o dockcross-Makefile
-for image in $(make -f dockcross-Makefile display_images); do
-  if [[ $(docker images -q dockcross/$image) == "" ]]; then
-    echo "~/bin/dockcross-$image skipping: image not found locally"
-    continue
-  fi
-  echo "~/bin/dockcross-$image ok"
-  docker run dockcross/$image > ~/bin/dockcross-$image && \
-  chmod u+x  ~/bin/dockcross-$image
-done
-```
+    curl https://raw.githubusercontent.com/dockcross/dockcross/master/Makefile -o dockcross-Makefile
+    for image in $(make -f dockcross-Makefile display_images); do
+      if [[ $(docker images -q dockcross/$image) == "" ]]; then
+        echo "~/bin/dockcross-$image skipping: image not found locally"
+        continue
+      fi
+      echo "~/bin/dockcross-$image ok"
+      docker run dockcross/$image > ~/bin/dockcross-$image && \
+      chmod u+x  ~/bin/dockcross-$image
+    done
 
 ## Dockcross configuration
 
@@ -444,11 +401,15 @@ Default: Image with which the script was created.
 
 ### DOCKCROSS_ARGS / \--args\|-a \<docker-run-args>
 
-Extra arguments to pass to the `docker run` command. Quote the entire set of args if they contain spaces.
+Extra arguments to pass to the `docker run` command. Quote the entire
+set of args if they contain spaces.
 
 ## Per-project dockcross configuration
 
-If a shell script named `.dockcross` is found in the current directory where the dockcross script is started, it is executed before the dockcross script `command` argument. The shell script is expected to have a shebang like `#!/usr/bin/env bash`.
+If a shell script named `.dockcross` is found in the current directory
+where the dockcross script is started, it is executed before the
+dockcross script `command` argument. The shell script is expected to
+have a shebang like `#!/usr/bin/env bash`.
 
 For example, commands like
 `git config --global advice.detachedHead false` can be added to this
@@ -466,33 +427,43 @@ In order to extend Dockcross images with your own commands, one must:
 
 An example Dockerfile would be:
 
-```
-FROM dockcross/linux-armv7
+    FROM dockcross/linux-armv7
 
-ENV DEFAULT_DOCKCROSS_IMAGE my_cool_image
-RUN apt-get install nano
-```
+    ENV DEFAULT_DOCKCROSS_IMAGE my_cool_image
+    RUN apt-get install nano
 
 And then in the shell:
 
-```
-docker build -t my_cool_image .                   ## Builds the dockcross image.
-docker run my_cool_image > linux-armv7                ## Creates a helper script named linux-armv7.
-chmod +x linux-armv7                          ## Gives the script execution permission.
-./linux-armv7 bash                            ## Runs the helper script with the argument "bash", which starts an interactive container using your extended image.
-```
+    docker build -t my_cool_image .                   ## Builds the dockcross image.
+    docker run my_cool_image > linux-armv7                ## Creates a helper script named linux-armv7.
+    chmod +x linux-armv7                          ## Gives the script execution permission.
+    ./linux-armv7 bash                            ## Runs the helper script with the argument "bash", which starts an interactive container using your extended image.
 
-## What is the difference between **dockcross** and **dockbuild** ?
+## What is the difference between [dockcross]{.title-ref} and [dockbuild]{.title-ref} ?
 
-The key difference is that [dockbuild](https://github.com/dockbuild/dockbuild#readme) images do **NOT** provide a [toolchain file](https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html) but they use the same method to conveniently isolate the build environment as [dockcross](https://github.com/dockcross/dockcross#readme).
+The key difference is that
+[dockbuild](https://github.com/dockbuild/dockbuild#readme) images do
+**NOT** provide a [toolchain
+file](https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html)
+but they use the same method to conveniently isolate the build
+environment as
+[dockcross](https://github.com/dockcross/dockcross#readme).
 
-**dockbuild** is used to build binaries for Linux x86_64/amd64 that will work across most Linux distributions.
-**dockbuild** performs a native Linux build where the host build system is a Linux x86_64 / amd64 Docker image (so that it can be used for building binaries on any system which can run Docker images) and the target runtime system is Linux x86_x64/ amd64.
+[dockbuild]{.title-ref} is used to build binaries for Linux x86_64 /
+amd64 that will work across most Linux distributions.
+[dockbuild]{.title-ref} performs a native Linux build where the host
+build system is a Linux x86_64 / amd64 Docker image (so that it can be
+used for building binaries on any system which can run Docker images)
+and the target runtime system is Linux x86_x64 / amd64.
 
-**dockcross** is used to build binaries for many different platforms. **dockcross** performs a cross compilation where the host build system is a Linux x86_64 / amd64 Docker image (so that it can be used for building binaries on any system which can run Docker images) and the target runtime system varies.
+[dockcross]{.title-ref} is used to build binaries for many different
+platforms. [dockcross]{.title-ref} performs a cross compilation where
+the host build system is a Linux x86_64 / amd64 Docker image (so that it
+can be used for building binaries on any system which can run Docker
+images) and the target runtime system varies.
 
 \-\--
 
-Credits:
-- [sdt/docker-raspberry-pi-cross-compiler](https://github.com/sdt/docker-raspberry-pi-cross-compiler), who invented the base of the **dockcross** script.
-- [https://github.com/steeve/cross-compiler](https://github.com/steeve/cross-compiler), 
+Credits go to
+[sdt/docker-raspberry-pi-cross-compiler](https://github.com/sdt/docker-raspberry-pi-cross-compiler),
+who invented the base of the **dockcross** script.

android-arm/Dockerfile.in

@@ -9,19 +9,20 @@ RUN apt-get update && apt-get install -y \
 
 ENV CROSS_TRIPLE=arm-linux-androideabi
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
-ENV AS=${CROSS_ROOT}/bin/llvm-as \
-    AR=${CROSS_ROOT}/bin/llvm-ar \
-    CC=${CROSS_ROOT}/bin/clang \
-    CXX=${CROSS_ROOT}/bin/clang++ \
-    LD=${CROSS_ROOT}/bin/ld
-
-ENV ANDROID_NDK_REVISION 23
-ENV ANDROID_NDK_API 23
+ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
+    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
+    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
+    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
+    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 
+ENV ANDROID_NDK_REVISION 22b
+ENV ANDROID_NDK_API 22
 RUN mkdir -p /build && \
     cd /build && \
-    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
-    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
+    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
+    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch arm \

android-arm/Toolchain.cmake

@@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR armv7-a)
 set(CMAKE_ANDROID_ARCH_ABI armeabi-v7a)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_triple arm-linux-androideabi)
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE ON)
 set(CMAKE_ANDROID_ARM_NEON ON)

android-arm64/Dockerfile.in

@@ -13,19 +13,20 @@ RUN apt-get update && apt-get install -y \
 
 ENV CROSS_TRIPLE=aarch64-linux-android
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
-ENV AS=${CROSS_ROOT}/bin/llvm-as \
-    AR=${CROSS_ROOT}/bin/llvm-ar \
-    CC=${CROSS_ROOT}/bin/clang \
-    CXX=${CROSS_ROOT}/bin/clang++ \
-    LD=${CROSS_ROOT}/bin/ld
-
-ENV ANDROID_NDK_REVISION 23
-ENV ANDROID_NDK_API 23
+ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
+    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
+    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
+    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
+    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 
+ENV ANDROID_NDK_REVISION 22b
+ENV ANDROID_NDK_API 22
 RUN mkdir -p /build && \
     cd /build && \
-    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
-    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
+    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
+    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch arm64 \

android-arm64/Toolchain.cmake

@@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 set(CMAKE_ANDROID_ARCH_ABI arm64-v8a)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_triple aarch64-linux-android)
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE ON)
 set(CMAKE_ANDROID_ARM_NEON ON)

android-x86/Dockerfile

@@ -4,19 +4,20 @@ RUN apt-get update && apt-get install -y unzip
 
 ENV CROSS_TRIPLE=i686-linux-android
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
-ENV AS=${CROSS_ROOT}/bin/llvm-as \
-    AR=${CROSS_ROOT}/bin/llvm-ar \
-    CC=${CROSS_ROOT}/bin/clang \
-    CXX=${CROSS_ROOT}/bin/clang++ \
-    LD=${CROSS_ROOT}/bin/ld
-
-ENV ANDROID_NDK_REVISION 23
-ENV ANDROID_NDK_API 23
+ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
+    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
+    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
+    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
+    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 
+ENV ANDROID_NDK_REVISION 22b
+ENV ANDROID_NDK_API 22
 RUN mkdir -p /build && \
     cd /build && \
-    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
-    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
+    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
+    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch x86 \

android-x86/Toolchain.cmake

@@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR i686)
 set(CMAKE_ANDROID_ARCH_ABI x86)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_triple i686-linux-android)
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE ON)
 set(CMAKE_ANDROID_ARM_NEON ON)

android-x86_64/Dockerfile

@@ -4,19 +4,20 @@ RUN apt-get update && apt-get install -y unzip
 
 ENV CROSS_TRIPLE=x86_64-linux-android
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
-ENV AS=${CROSS_ROOT}/bin/llvm-as \
-    AR=${CROSS_ROOT}/bin/llvm-ar \
-    CC=${CROSS_ROOT}/bin/clang \
-    CXX=${CROSS_ROOT}/bin/clang++ \
-    LD=${CROSS_ROOT}/bin/ld
-
-ENV ANDROID_NDK_REVISION 23
-ENV ANDROID_NDK_API 23
+ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
+    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
+    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
+    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
+    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 
+ENV ANDROID_NDK_REVISION 22b
+ENV ANDROID_NDK_API 22
 RUN mkdir -p /build && \
     cd /build && \
-    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
-    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux.zip && \
+    curl -O https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
+    unzip ./android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip && \
     cd android-ndk-r${ANDROID_NDK_REVISION} && \
     ./build/tools/make_standalone_toolchain.py \
       --arch x86_64 \

android-x86_64/Toolchain.cmake

@@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 set(CMAKE_ANDROID_ARCH_ABI x86_64)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_triple x86_64-linux-android)
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE ON)
 set(CMAKE_ANDROID_ARM_NEON ON)

common/common.buildroot

@@ -1,30 +0,0 @@
-
-# Install Debian packages required for `buildroot`.
-RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
-    gawk \
-    gperf \
-    help2man \
-    python3-dev \
-    texinfo \
-    unzip \
-    libtool \
-    libtool-bin \
-    && apt-get clean autoclean --yes \
-    && apt-get autoremove --yes \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/
-
-COPY \
-  imagefiles/install-buildroot-toolchain.sh \
-  buildroot.config \
-  /dockcross/
-
-# Build and install the toolchain, cleaning up artifacts afterwards.
-RUN mkdir /dockcross/buildroot \
-    && cd /dockcross/buildroot \
-    && /dockcross/install-buildroot-toolchain.sh \
-    -c "/dockcross/buildroot.config" \
-    -v "${BR_VERSION}" \
-    && rm -rf /dockcross/buildroot /dockcross/install-buildroot-toolchain.sh
-
-# Restore our default workdir (from "dockcross/base").
-WORKDIR /work

common/common.crosstool

@@ -48,7 +48,7 @@ RUN mkdir /dockcross/crosstool \
 && cd /dockcross/crosstool \
 && /dockcross/install-crosstool-ng-toolchain.sh \
   -p "${XCC_PREFIX}" \
-  -c "/dockcross/crosstool-ng.config" \
+  -c /dockcross/crosstool-ng.config \
   -v "${CT_VERSION}" \
 && rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh
 

common/common.docker

@@ -1,7 +1,7 @@
 WORKDIR /usr/src
 
 ARG GIT_VERSION=2.32.0
-ARG CMAKE_VERSION=3.21.1
+ARG CMAKE_VERSION=3.20.5
 
 # Image build scripts
 COPY \

imagefiles/build-and-install-cmake.sh

@@ -25,7 +25,7 @@ if ! command -v git &> /dev/null; then
 	exit 1
 fi
 
-if [[ -z "${CMAKE_VERSION}" ]]; then
+if [[ "${CMAKE_VERSION}" == "" ]]; then
   echo >&2 'error: CMAKE_VERSION env. variable must be set to a non-empty value'
   exit 1
 fi
@@ -33,16 +33,16 @@ fi
 cd /usr/src
 
 # If the first link doesn't work, it will use the mirror on github
-git clone "$CMAKE_URL" CMake -b "v$CMAKE_VERSION" --depth 1 \
-  || git clone "$CMAKE_MIRROR_URL" CMake -b "v$CMAKE_VERSION" --depth 1
+git clone "$CMAKE_URL" CMake -b v$CMAKE_VERSION --depth 1 \
+  || git clone "$CMAKE_MIRROR_URL" CMake -b v$CMAKE_VERSION --depth 1
 
 mkdir /usr/src/CMake-build
 cd /usr/src/CMake-build
 
 ${WRAPPER} /usr/src/CMake/bootstrap \
-  --parallel="$(nproc)" \
+  --parallel=$(nproc) \
   -- -DCMAKE_USE_OPENSSL=OFF
-${WRAPPER} make -j"$(nproc)"
+${WRAPPER} make -j$(nproc)
 
 
 mkdir /usr/src/CMake-ssl-build
@@ -55,7 +55,7 @@ ${WRAPPER} /usr/src/CMake-build/bin/cmake \
   -DCMAKE_USE_OPENSSL:BOOL=ON \
   -DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl \
   ../CMake
-${WRAPPER} make -j"$(nproc)" install
+${WRAPPER} make -j$(nproc) install
 
 # Cleanup install tree
 cd /usr/src/cmake-$CMAKE_VERSION

imagefiles/build-and-install-curl.sh

@@ -18,7 +18,7 @@ function do_curl_build {
     # We do this shared to avoid obnoxious linker issues where git couldn't
     # link properly. If anyone wants to make this build statically go for it.
     LIBS=-ldl CFLAGS=-Wl,--exclude-libs,ALL ./configure --with-ssl --disable-static > /dev/null
-    make -j"$(nproc)" > /dev/null
+    make -j$(nproc) > /dev/null
     make install > /dev/null
 }
 

imagefiles/build-and-install-git.sh

@@ -12,7 +12,7 @@ if ! command -v tar &> /dev/null; then
 	exit 1
 fi
 
-if [[ -z "${GIT_VERSION}" ]]; then
+if [[ "${GIT_VERSION}" == "" ]]; then
   echo >&2 'error: GIT_VERSION env. variable must be set to a non-empty value'
   exit 1
 fi
@@ -32,18 +32,18 @@ curl --connect-timeout 20 \
     --retry-max-time 40 \
     -# -LO $url
 
-tar xvzf "git-${GIT_VERSION}.tar.gz" --no-same-owner
-rm -f "git-${GIT_VERSION}.tar.gz"
+tar xvzf git-${GIT_VERSION}.tar.gz  --no-same-owner
+rm -f git-${GIT_VERSION}.tar.gz
 
-pushd "git-${GIT_VERSION}"
+pushd git-${GIT_VERSION}
 ./configure --prefix=/usr/local --with-curl
-make -j"$(nproc)"
+make -j$(nproc)
 make install
 popd
 
 ldconfig
 
-rm -rf "git-${GIT_VERSION}"
+rm -rf git-${GIT_VERSION}
 
 # turn the detached message off
 git config --global advice.detachedHead false

imagefiles/build-and-install-openssl.sh

@@ -59,7 +59,7 @@ PERL_DOWNLOAD_URL=https://www.cpan.org/src/5.0
 
 function do_perl_build {
     ${WRAPPER} sh Configure -des -Dprefix=/opt/perl > /dev/null
-    ${WRAPPER} make -j"$(nproc)" > /dev/null
+    ${WRAPPER} make -j$(nproc) > /dev/null
     ${WRAPPER} make install > /dev/null
 }
 
@@ -84,7 +84,7 @@ function build_perl {
 
 function do_openssl_build {
     ${WRAPPER} ./config no-shared -fPIC $CONFIG_FLAG --prefix=/usr/local/ssl --openssldir=/usr/local/ssl > /dev/null
-    ${WRAPPER} make -j"$(nproc)" > /dev/null
+    ${WRAPPER} make -j$(nproc) > /dev/null
     ${WRAPPER} make install_sw > /dev/null
 }
 

imagefiles/build-and-install-python.sh

@@ -25,13 +25,13 @@ while [ $# -gt 0 ]; do
 done
 
 # Download
-wget "https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz"
-tar xvf "Python-${PYTHON_VERSION}.tgz"
+wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
+tar xvf Python-${PYTHON_VERSION}.tgz
 # Configure, build and install
-cd "Python-${PYTHON_VERSION}" || exit 1
+cd Python-${PYTHON_VERSION}
 # Disable --enable-shared --enable-optimizations --prefix=/usr/local/python-${PYTHON_VERSION}
 ./configure --with-ensurepip=install
-make -j"$(nproc) "
+make -j$(nproc) 
 make install #altinstall
 
 ln -s /usr/local/bin/python3 /usr/local/bin/python
@@ -39,4 +39,4 @@ ln -s /usr/local/bin/pip3 /usr/local/bin/pip
 
 # Clean
 cd ..
-rm -rf "Python-${PYTHON_VERSION}"
+rm -rf Python-${PYTHON_VERSION}

imagefiles/dockcross.sh

@@ -41,20 +41,20 @@ command:update-image() {
 }
 
 help:update-image() {
-    echo "Pull the latest $FINAL_IMAGE ."
+    echo Pull the latest $FINAL_IMAGE .
 }
 
 command:update-script() {
     if cmp -s <( $OCI_EXE run --rm $FINAL_IMAGE ) $0; then
-        echo "$0 is up to date"
+        echo $0 is up to date
     else
-        echo -n "Updating $0 ... "
+        echo -n Updating $0 '... '
         $OCI_EXE run --rm $FINAL_IMAGE > $0 && echo ok
     fi
 }
 
 help:update-image() {
-    echo "Update $0 from $FINAL_IMAGE ."
+    echo Update $0 from $FINAL_IMAGE .
 }
 
 command:update() {
@@ -63,7 +63,7 @@ command:update() {
 }
 
 help:update() {
-    echo "Pull the latest $FINAL_IMAGE, and then update $0 from that."
+    echo Pull the latest $FINAL_IMAGE, and then update $0 from that.
 }
 
 command:help() {

imagefiles/entrypoint.sh

@@ -24,8 +24,8 @@ fi
 # The dockcross script sets the BUILDER_UID and BUILDER_GID vars.
 if [[ -n $BUILDER_UID ]] && [[ -n $BUILDER_GID ]]; then
 
-    groupadd -o -g "$BUILDER_GID" "$BUILDER_GROUP" 2> /dev/null
-    useradd -o -m -g "$BUILDER_GID" -u "$BUILDER_UID" "$BUILDER_USER" 2> /dev/null
+    groupadd -o -g $BUILDER_GID $BUILDER_GROUP 2> /dev/null
+    useradd -o -m -g $BUILDER_GID -u $BUILDER_UID $BUILDER_USER 2> /dev/null
     export HOME=/home/${BUILDER_USER}
     shopt -s dotglob
     cp -r /root/* $HOME/
@@ -37,8 +37,8 @@ if [[ -n $BUILDER_UID ]] && [[ -n $BUILDER_GID ]]; then
     fi
 
     # Enable passwordless sudo capabilities for the user
-    chown root:$BUILDER_GID "$(which gosu)"
-    chmod +s "$(which gosu)"; sync
+    chown root:$BUILDER_GID $(which gosu)
+    chmod +s $(which gosu); sync
 
     # Execute project specific pre execution hook
     if [[ -e /work/.dockcross ]]; then

imagefiles/install-buildroot-toolchain.sh

@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-set -x
-set -e
-set -o pipefail
-
-ROOT=${PWD}
-
-usage() { echo "Usage: $0 -c <config-path> -v <version>" 1>&2; exit 1; }
-
-REPO_URL="https://github.com/buildroot/buildroot.git"
-
-CONFIG_PATH=""
-REV="2021.08-rc1"
-while getopts "c:v:" o; do
-  case "${o}" in
-  c)
-    CONFIG_PATH=$(readlink -f ${OPTARG})
-    ;;
-  v)
-    REV=${OPTARG}
-    ;;
-  *)
-    usage
-    ;;
-  esac
-done
-shift $((OPTIND-1))
-
-if [ -z ${CONFIG_PATH} ] || [ ! -f ${CONFIG_PATH} ]; then
-  echo "ERROR: Missing config path (-c)."
-  usage
-fi
-
-if [ -z ${REV} ]; then
-  echo "WARNING: No version selected, use default version: $REV (-v)."
-fi
-
-
-git clone "$REPO_URL" --recurse-submodules --remote-submodules #--branch="$REV"
-cd buildroot
-git checkout "$REV"
-cp "$CONFIG_PATH" .config
-make

imagefiles/install-cmake-binary.sh

@@ -28,7 +28,7 @@ if ! command -v tar &> /dev/null; then
 	exit 1
 fi
 
-if [[ -z "${CMAKE_VERSION}" ]]; then
+if [[ "${CMAKE_VERSION}" == "" ]]; then
   echo >&2 'error: CMAKE_VERSION env. variable must be set to a non-empty value'
   exit 1
 fi
@@ -45,10 +45,10 @@ curl --connect-timeout 30 \
     --retry-max-time 30 \
     -# -LO $url
 
-tar -xzvf "${CMAKE_ROOT}.tar.gz"
-rm -f "${CMAKE_ROOT}.tar.gz"
+tar -xzvf ${CMAKE_ROOT}.tar.gz
+rm -f ${CMAKE_ROOT}.tar.gz
 
-cd "${CMAKE_ROOT}"
+cd ${CMAKE_ROOT}
 
 rm -rf doc man
 rm -rf bin/cmake-gui

imagefiles/install-crosstool-ng-toolchain.sh

@@ -89,7 +89,7 @@ BOOTSTRAP_PREFIX="${CTNG}/prefix"
 ./bootstrap
 ./configure \
   --prefix "${BOOTSTRAP_PREFIX}"
-make -j"$(nproc)"
+make -j$(nproc)
 make install
 
 ##

imagefiles/install-gosu-binary.sh

@@ -14,7 +14,7 @@ if ! command -v gpg &> /dev/null; then
 fi
 
 GOSU_VERSION=1.12
-dpkgArch=$(if test "$(uname -m)" = "x86_64"; then echo amd64; else echo i386; fi)
+dpkgArch=$(if test $(uname -m) = "x86_64"; then echo amd64; else echo i386; fi)
 url="https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${dpkgArch}"
 url_key="https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${dpkgArch}.asc"
 

linux-arm64-full/Dockerfile.in

@@ -1,42 +0,0 @@
-FROM dockcross/base:latest
-
-# This is for 64-bit ARM Linux machine
-
-# Buildroot version
-# crosstool-ng master 2021-08-21
-ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01
-
-#include "common.buildroot"
-
-# The cross-compiling emulator
-RUN apt-get update \
-&& apt-get install -y \
-  qemu-user \
-  qemu-user-static \
-&& apt-get clean --yes
-
-# The CROSS_TRIPLE is a configured alias of the "aarch64-buildroot-linux-gnu" target.
-ENV CROSS_TRIPLE aarch64-buildroot-linux-gnu
-ENV CROSS_ROOT /buildroot
-ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
-    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
-    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
-
-ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
-ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
-
-COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
-
-#ENV PKG_CONFIG_PATH /usr/lib/aarch64-linux-gnu/pkgconfig
-
-# Linux kernel cross compilation variables
-ENV PATH ${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE ${CROSS_TRIPLE}-
-ENV ARCH arm64
-
-#include "common.label-and-env"

linux-arm64-full/Toolchain.cmake

@@ -1,21 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR aarch64)
-
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
-
-set(CMAKE_C_COMPILER $ENV{CC})
-set(CMAKE_CXX_COMPILER $ENV{CXX})
-set(CMAKE_Fortran_COMPILER $ENV{FC})
-
-set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")
-
-set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple})
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
-
-set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot)
-
-set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-aarch64)

linux-arm64/Dockerfile.in

@@ -4,8 +4,8 @@ FROM dockcross/base:latest
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-08-04
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 #include "common.crosstool"
 
@@ -16,8 +16,8 @@ RUN apt-get update \
   qemu-user-static \
 && apt-get clean --yes
 
-# The CROSS_TRIPLE is a configured alias of the "aarch64-unknown-linux-gnu" target.
-ENV CROSS_TRIPLE aarch64-unknown-linux-gnu
+# The CROSS_TRIPLE is a configured alias of the "aarch64-unknown-linux-gnueabi" target.
+ENV CROSS_TRIPLE aarch64-unknown-linux-gnueabi
 
 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \

linux-arm64/Toolchain.cmake

@@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 
-set(cross_triple "aarch64-unknown-linux-gnu")
+set(cross_triple "aarch64-unknown-linux-gnueabi")
 set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})

linux-arm64/crosstool-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.409_d47b234 Configuration
+# crosstool-NG 1.24.0.385_9e10cb6 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.409_d47b234"
+CT_VERSION="1.24.0.385_9e10cb6"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="3"
 CT_CONFIG_VERSION_CURRENT="3"
@@ -99,7 +99,6 @@ CT_PARALLEL_JOBS=0
 CT_LOAD=""
 CT_USE_PIPES=y
 CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_CXXFLAGS_FOR_BUILD=""
 CT_EXTRA_LDFLAGS_FOR_BUILD=""
 CT_EXTRA_CFLAGS_FOR_HOST=""
 CT_EXTRA_LDFLAGS_FOR_HOST=""
@@ -152,6 +151,8 @@ CT_ARCH_ARM_SHOW=y
 # Options for arm
 #
 CT_ARCH_ARM_PKG_KSYM=""
+CT_ARCH_ARM_EABI_FORCE=y
+CT_ARCH_ARM_EABI=y
 CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
 CT_ARCH_SUFFIX=""
 # CT_OMIT_TARGET_VENDOR is not set
@@ -256,8 +257,7 @@ CT_LINUX_PKG_NAME="linux"
 CT_LINUX_SRC_RELEASE=y
 # CT_LINUX_SRC_DEVEL is not set
 CT_LINUX_PATCH_ORDER="global"
-CT_LINUX_V_5_13=y
-# CT_LINUX_V_5_12 is not set
+CT_LINUX_V_5_12=y
 # CT_LINUX_V_5_11 is not set
 # CT_LINUX_V_5_10 is not set
 # CT_LINUX_V_5_9 is not set
@@ -286,7 +286,7 @@ CT_LINUX_V_5_13=y
 # CT_LINUX_V_3_13 is not set
 # CT_LINUX_V_3_12 is not set
 # CT_LINUX_V_3_10 is not set
-CT_LINUX_VERSION="5.13.1"
+CT_LINUX_VERSION="5.12.12"
 CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
 CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -469,17 +469,15 @@ CT_GLIBC_OLDEST_ABI=""
 CT_GLIBC_FORCE_UNWIND=y
 # CT_GLIBC_LOCALES is not set
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
-# CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-CT_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_GLIBC_MIN_KERNEL_VERSION="5.4.0"
-CT_GLIBC_MIN_KERNEL="5.4.0"
+CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_GLIBC_MIN_KERNEL="5.12.12"
 CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_NO is not set
 # CT_GLIBC_SSP_YES is not set
 # CT_GLIBC_SSP_ALL is not set
 # CT_GLIBC_SSP_STRONG is not set
 # CT_GLIBC_ENABLE_WERROR is not set
-# CT_GLIBC_ENABLE_COMMON_FLAG is not set
 CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -527,7 +525,7 @@ CT_GCC_V_11=y
 # CT_GCC_V_8 is not set
 # CT_GCC_V_7 is not set
 # CT_GCC_V_6 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="11.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

linux-armv5/Dockerfile.in

@@ -6,8 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-08-04
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 #include "common.crosstool"
 

linux-armv5/Toolchain.cmake

@@ -1,9 +1,8 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_triple "armv5-unknown-linux-gnueabi")
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

linux-armv5/crosstool-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.409_d47b234 Configuration
+# crosstool-NG 1.24.0.385_9e10cb6 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.409_d47b234"
+CT_VERSION="1.24.0.385_9e10cb6"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="3"
 CT_CONFIG_VERSION_CURRENT="3"
@@ -99,7 +99,6 @@ CT_PARALLEL_JOBS=0
 CT_LOAD=""
 CT_USE_PIPES=y
 CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_CXXFLAGS_FOR_BUILD=""
 CT_EXTRA_LDFLAGS_FOR_BUILD=""
 CT_EXTRA_CFLAGS_FOR_HOST=""
 CT_EXTRA_LDFLAGS_FOR_HOST=""
@@ -269,8 +268,7 @@ CT_LINUX_PKG_NAME="linux"
 CT_LINUX_SRC_RELEASE=y
 # CT_LINUX_SRC_DEVEL is not set
 CT_LINUX_PATCH_ORDER="global"
-CT_LINUX_V_5_13=y
-# CT_LINUX_V_5_12 is not set
+CT_LINUX_V_5_12=y
 # CT_LINUX_V_5_11 is not set
 # CT_LINUX_V_5_10 is not set
 # CT_LINUX_V_5_9 is not set
@@ -301,7 +299,7 @@ CT_LINUX_V_5_13=y
 # CT_LINUX_V_3_10 is not set
 # CT_LINUX_V_3_4 is not set
 # CT_LINUX_V_3_2 is not set
-CT_LINUX_VERSION="5.13.1"
+CT_LINUX_VERSION="5.12.12"
 CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
 CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -485,15 +483,14 @@ CT_GLIBC_FORCE_UNWIND=y
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
 # CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
 CT_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_GLIBC_MIN_KERNEL_VERSION="4.10.0"
-CT_GLIBC_MIN_KERNEL="4.10.0"
+CT_GLIBC_MIN_KERNEL_VERSION="3.2.27"
+CT_GLIBC_MIN_KERNEL="3.2.27"
 CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_NO is not set
 # CT_GLIBC_SSP_YES is not set
 # CT_GLIBC_SSP_ALL is not set
 # CT_GLIBC_SSP_STRONG is not set
 # CT_GLIBC_ENABLE_WERROR is not set
-# CT_GLIBC_ENABLE_COMMON_FLAG is not set
 CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -541,7 +538,7 @@ CT_GCC_V_11=y
 # CT_GCC_V_8 is not set
 # CT_GCC_V_7 is not set
 # CT_GCC_V_6 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="11.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

linux-armv6-lts/Dockerfile.in

@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-08-04
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 # This is for 32-bit ARMv6 Linux
 # Raspberry Pi is ARMv6+VFP2

linux-armv6-lts/Toolchain.cmake

@@ -1,9 +1,8 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_triple "armv6-unknown-linux-gnueabihf")
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

linux-armv6/Dockerfile.in

@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-08-04
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 # This is for 32-bit ARMv6 Linux
 # Raspberry Pi is ARMv6+VFP2

linux-armv6/crosstool-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.409_d47b234 Configuration
+# crosstool-NG 1.24.0.385_9e10cb6 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.409_d47b234"
+CT_VERSION="1.24.0.385_9e10cb6"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="3"
 CT_CONFIG_VERSION_CURRENT="3"
@@ -99,7 +99,6 @@ CT_PARALLEL_JOBS=4
 CT_LOAD=""
 CT_USE_PIPES=y
 CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_CXXFLAGS_FOR_BUILD=""
 CT_EXTRA_LDFLAGS_FOR_BUILD=""
 CT_EXTRA_CFLAGS_FOR_HOST=""
 CT_EXTRA_LDFLAGS_FOR_HOST=""
@@ -270,8 +269,7 @@ CT_LINUX_PKG_NAME="linux"
 CT_LINUX_SRC_RELEASE=y
 # CT_LINUX_SRC_DEVEL is not set
 CT_LINUX_PATCH_ORDER="global"
-CT_LINUX_V_5_13=y
-# CT_LINUX_V_5_12 is not set
+CT_LINUX_V_5_12=y
 # CT_LINUX_V_5_11 is not set
 # CT_LINUX_V_5_10 is not set
 # CT_LINUX_V_5_9 is not set
@@ -302,7 +300,7 @@ CT_LINUX_V_5_13=y
 # CT_LINUX_V_3_10 is not set
 # CT_LINUX_V_3_4 is not set
 # CT_LINUX_V_3_2 is not set
-CT_LINUX_VERSION="5.13.1"
+CT_LINUX_VERSION="5.12.12"
 CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
 CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -484,17 +482,15 @@ CT_GLIBC_OLDEST_ABI=""
 CT_GLIBC_FORCE_UNWIND=y
 # CT_GLIBC_LOCALES is not set
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
-# CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-CT_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_GLIBC_MIN_KERNEL_VERSION="5.4.0"
-CT_GLIBC_MIN_KERNEL="5.4.0"
+CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_GLIBC_MIN_KERNEL="5.12.12"
 CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_NO is not set
 # CT_GLIBC_SSP_YES is not set
 # CT_GLIBC_SSP_ALL is not set
 # CT_GLIBC_SSP_STRONG is not set
 # CT_GLIBC_ENABLE_WERROR is not set
-# CT_GLIBC_ENABLE_COMMON_FLAG is not set
 CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -542,7 +538,7 @@ CT_GCC_V_11=y
 # CT_GCC_V_8 is not set
 # CT_GCC_V_7 is not set
 # CT_GCC_V_6 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="11.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

linux-armv7/Dockerfile.in

@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-08-04
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 # This is for 32-bit ARMv7 Linux
 #include "common.crosstool"

linux-armv7/Toolchain.cmake

@@ -1,9 +1,8 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_triple "armv7-unknown-linux-gnueabi")
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

linux-armv7/crosstool-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.409_d47b234 Configuration
+# crosstool-NG 1.24.0.385_9e10cb6 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.409_d47b234"
+CT_VERSION="1.24.0.385_9e10cb6"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="3"
 CT_CONFIG_VERSION_CURRENT="3"
@@ -99,7 +99,6 @@ CT_PARALLEL_JOBS=0
 CT_LOAD=""
 CT_USE_PIPES=y
 CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_CXXFLAGS_FOR_BUILD=""
 CT_EXTRA_LDFLAGS_FOR_BUILD=""
 CT_EXTRA_CFLAGS_FOR_HOST=""
 CT_EXTRA_LDFLAGS_FOR_HOST=""
@@ -270,8 +269,7 @@ CT_LINUX_PKG_NAME="linux"
 CT_LINUX_SRC_RELEASE=y
 # CT_LINUX_SRC_DEVEL is not set
 CT_LINUX_PATCH_ORDER="global"
-CT_LINUX_V_5_13=y
-# CT_LINUX_V_5_12 is not set
+CT_LINUX_V_5_12=y
 # CT_LINUX_V_5_11 is not set
 # CT_LINUX_V_5_10 is not set
 # CT_LINUX_V_5_9 is not set
@@ -302,7 +300,7 @@ CT_LINUX_V_5_13=y
 # CT_LINUX_V_3_10 is not set
 # CT_LINUX_V_3_4 is not set
 # CT_LINUX_V_3_2 is not set
-CT_LINUX_VERSION="5.13.1"
+CT_LINUX_VERSION="5.12.12"
 CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
 CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -484,17 +482,15 @@ CT_GLIBC_OLDEST_ABI=""
 CT_GLIBC_FORCE_UNWIND=y
 # CT_GLIBC_LOCALES is not set
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
-# CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-CT_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_GLIBC_MIN_KERNEL_VERSION="5.4.0"
-CT_GLIBC_MIN_KERNEL="5.4.0"
+CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_GLIBC_MIN_KERNEL="5.12.12"
 CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_NO is not set
 # CT_GLIBC_SSP_YES is not set
 # CT_GLIBC_SSP_ALL is not set
 # CT_GLIBC_SSP_STRONG is not set
 # CT_GLIBC_ENABLE_WERROR is not set
-# CT_GLIBC_ENABLE_COMMON_FLAG is not set
 CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -542,7 +538,7 @@ CT_GCC_V_11=y
 # CT_GCC_V_8 is not set
 # CT_GCC_V_7 is not set
 # CT_GCC_V_6 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="11.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

linux-armv7a/Dockerfile.in

@@ -4,8 +4,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # This is for 32-bit ARMv7 Linux
 
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-08-04
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 #include "common.crosstool"
 

linux-armv7a/Toolchain.cmake

@@ -1,9 +1,8 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_triple "arm-cortexa8_neon-linux-gnueabihf")
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

linux-armv7a/crosstool-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.409_d47b234 Configuration
+# crosstool-NG 1.24.0.385_9e10cb6 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.409_d47b234"
+CT_VERSION="1.24.0.385_9e10cb6"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="3"
 CT_CONFIG_VERSION_CURRENT="3"
@@ -99,7 +99,6 @@ CT_PARALLEL_JOBS=0
 CT_LOAD=""
 CT_USE_PIPES=y
 CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_CXXFLAGS_FOR_BUILD=""
 CT_EXTRA_LDFLAGS_FOR_BUILD=""
 CT_EXTRA_CFLAGS_FOR_HOST=""
 CT_EXTRA_LDFLAGS_FOR_HOST=""
@@ -270,8 +269,7 @@ CT_LINUX_PKG_NAME="linux"
 CT_LINUX_SRC_RELEASE=y
 # CT_LINUX_SRC_DEVEL is not set
 CT_LINUX_PATCH_ORDER="global"
-CT_LINUX_V_5_13=y
-# CT_LINUX_V_5_12 is not set
+CT_LINUX_V_5_12=y
 # CT_LINUX_V_5_11 is not set
 # CT_LINUX_V_5_10 is not set
 # CT_LINUX_V_5_9 is not set
@@ -302,7 +300,7 @@ CT_LINUX_V_5_13=y
 # CT_LINUX_V_3_10 is not set
 # CT_LINUX_V_3_4 is not set
 # CT_LINUX_V_3_2 is not set
-CT_LINUX_VERSION="5.13.1"
+CT_LINUX_VERSION="5.12.12"
 CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
 CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -484,17 +482,15 @@ CT_GLIBC_OLDEST_ABI=""
 CT_GLIBC_FORCE_UNWIND=y
 # CT_GLIBC_LOCALES is not set
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
-# CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-CT_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_GLIBC_MIN_KERNEL_VERSION="5.4.0"
-CT_GLIBC_MIN_KERNEL="5.4.0"
+CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_GLIBC_MIN_KERNEL="5.12.12"
 CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_NO is not set
 # CT_GLIBC_SSP_YES is not set
 # CT_GLIBC_SSP_ALL is not set
 # CT_GLIBC_SSP_STRONG is not set
 # CT_GLIBC_ENABLE_WERROR is not set
-# CT_GLIBC_ENABLE_COMMON_FLAG is not set
 CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -542,7 +538,7 @@ CT_GCC_V_11=y
 # CT_GCC_V_8 is not set
 # CT_GCC_V_7 is not set
 # CT_GCC_V_6 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="11.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

linux-m68k-uclibc/Dockerfile.in

@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-08-04
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 ARG QEMU_VERSION=6.0.0
 

linux-m68k-uclibc/Toolchain.cmake

@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR mk68)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_triple "m68k-unknown-uclinux-uclibc")
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

linux-m68k-uclibc/crosstool-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.409_d47b234 Configuration
+# crosstool-NG 1.24.0.385_9e10cb6 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.409_d47b234"
+CT_VERSION="1.24.0.385_9e10cb6"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="3"
 CT_CONFIG_VERSION_CURRENT="3"
@@ -99,7 +99,6 @@ CT_PARALLEL_JOBS=0
 CT_LOAD=""
 CT_USE_PIPES=y
 CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_CXXFLAGS_FOR_BUILD=""
 CT_EXTRA_LDFLAGS_FOR_BUILD=""
 CT_EXTRA_CFLAGS_FOR_HOST=""
 CT_EXTRA_LDFLAGS_FOR_HOST=""
@@ -242,8 +241,7 @@ CT_LINUX_PKG_NAME="linux"
 CT_LINUX_SRC_RELEASE=y
 # CT_LINUX_SRC_DEVEL is not set
 CT_LINUX_PATCH_ORDER="global"
-CT_LINUX_V_5_13=y
-# CT_LINUX_V_5_12 is not set
+CT_LINUX_V_5_12=y
 # CT_LINUX_V_5_11 is not set
 # CT_LINUX_V_5_10 is not set
 # CT_LINUX_V_5_9 is not set
@@ -275,7 +273,7 @@ CT_LINUX_V_5_13=y
 # CT_LINUX_V_3_4 is not set
 # CT_LINUX_V_3_2 is not set
 # CT_LINUX_V_2_6_32 is not set
-CT_LINUX_VERSION="5.13.1"
+CT_LINUX_VERSION="5.12.12"
 CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
 CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -507,7 +505,7 @@ CT_GCC_V_11=y
 # CT_GCC_V_6 is not set
 # CT_GCC_V_5 is not set
 # CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="11.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

linux-mips/Dockerfile.in

@@ -4,8 +4,8 @@ FROM dockcross/base:latest
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-08-04
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 #include "common.crosstool"
 

linux-mips/Toolchain.cmake

@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR mips)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_triple "mips-unknown-linux-gnu")
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

linux-mips/crosstool-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.409_d47b234 Configuration
+# crosstool-NG 1.24.0.385_9e10cb6 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.409_d47b234"
+CT_VERSION="1.24.0.385_9e10cb6"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="3"
 CT_CONFIG_VERSION_CURRENT="3"
@@ -99,7 +99,6 @@ CT_PARALLEL_JOBS=0
 CT_LOAD=""
 CT_USE_PIPES=y
 CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_CXXFLAGS_FOR_BUILD=""
 CT_EXTRA_LDFLAGS_FOR_BUILD=""
 CT_EXTRA_CFLAGS_FOR_HOST=""
 CT_EXTRA_LDFLAGS_FOR_HOST=""
@@ -257,7 +256,6 @@ CT_LINUX_PKG_NAME="linux"
 CT_LINUX_SRC_RELEASE=y
 # CT_LINUX_SRC_DEVEL is not set
 CT_LINUX_PATCH_ORDER="global"
-# CT_LINUX_V_5_13 is not set
 CT_LINUX_V_5_12=y
 # CT_LINUX_V_5_11 is not set
 # CT_LINUX_V_5_10 is not set
@@ -289,7 +287,7 @@ CT_LINUX_V_5_12=y
 # CT_LINUX_V_3_10 is not set
 # CT_LINUX_V_3_4 is not set
 # CT_LINUX_V_3_2 is not set
-CT_LINUX_VERSION="5.12.16"
+CT_LINUX_VERSION="5.12.12"
 CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
 CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -464,17 +462,15 @@ CT_GLIBC_OLDEST_ABI=""
 CT_GLIBC_FORCE_UNWIND=y
 # CT_GLIBC_LOCALES is not set
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
-# CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-CT_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_GLIBC_MIN_KERNEL_VERSION="5.4.0"
-CT_GLIBC_MIN_KERNEL="5.4.0"
+CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_GLIBC_MIN_KERNEL="5.12.12"
 CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_NO is not set
 # CT_GLIBC_SSP_YES is not set
 # CT_GLIBC_SSP_ALL is not set
 # CT_GLIBC_SSP_STRONG is not set
 # CT_GLIBC_ENABLE_WERROR is not set
-# CT_GLIBC_ENABLE_COMMON_FLAG is not set
 CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -522,7 +518,7 @@ CT_GCC_V_11=y
 # CT_GCC_V_8 is not set
 # CT_GCC_V_7 is not set
 # CT_GCC_V_6 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="11.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

linux-ppc64le/Dockerfile.in

@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-08-04
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 ARG QEMU_VERSION=6.0.0
 

linux-ppc64le/Toolchain.cmake

@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR ppc64le)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_triple "powerpc64le-unknown-linux-gnu")
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

linux-ppc64le/crosstool-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.409_d47b234 Configuration
+# crosstool-NG 1.24.0.385_9e10cb6 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.409_d47b234"
+CT_VERSION="1.24.0.385_9e10cb6"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="3"
 CT_CONFIG_VERSION_CURRENT="3"
@@ -99,7 +99,6 @@ CT_PARALLEL_JOBS=0
 CT_LOAD=""
 CT_USE_PIPES=y
 CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_CXXFLAGS_FOR_BUILD=""
 CT_EXTRA_LDFLAGS_FOR_BUILD=""
 CT_EXTRA_CFLAGS_FOR_HOST=""
 CT_EXTRA_LDFLAGS_FOR_HOST=""
@@ -261,8 +260,7 @@ CT_LINUX_PKG_NAME="linux"
 CT_LINUX_SRC_RELEASE=y
 # CT_LINUX_SRC_DEVEL is not set
 CT_LINUX_PATCH_ORDER="global"
-CT_LINUX_V_5_13=y
-# CT_LINUX_V_5_12 is not set
+CT_LINUX_V_5_12=y
 # CT_LINUX_V_5_11 is not set
 # CT_LINUX_V_5_10 is not set
 # CT_LINUX_V_5_9 is not set
@@ -293,7 +291,7 @@ CT_LINUX_V_5_13=y
 # CT_LINUX_V_3_10 is not set
 # CT_LINUX_V_3_4 is not set
 # CT_LINUX_V_3_2 is not set
-CT_LINUX_VERSION="5.13.1"
+CT_LINUX_VERSION="5.12.12"
 CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
 CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -468,17 +466,15 @@ CT_GLIBC_OLDEST_ABI=""
 CT_GLIBC_FORCE_UNWIND=y
 # CT_GLIBC_LOCALES is not set
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
-# CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-CT_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_GLIBC_MIN_KERNEL_VERSION="5.4.0"
-CT_GLIBC_MIN_KERNEL="5.4.0"
+CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_GLIBC_MIN_KERNEL="5.12.12"
 CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_NO is not set
 # CT_GLIBC_SSP_YES is not set
 # CT_GLIBC_SSP_ALL is not set
 # CT_GLIBC_SSP_STRONG is not set
 # CT_GLIBC_ENABLE_WERROR is not set
-# CT_GLIBC_ENABLE_COMMON_FLAG is not set
 CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -526,7 +522,7 @@ CT_GCC_V_11=y
 # CT_GCC_V_8 is not set
 # CT_GCC_V_7 is not set
 # CT_GCC_V_6 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="11.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

linux-riscv32/Dockerfile.in

@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-08-04
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 ARG QEMU_VERSION=6.0.0
 

linux-riscv32/Toolchain.cmake

@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR riscv32)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_triple "riscv32-unknown-linux-gnu")
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

linux-riscv32/crosstool-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.409_d47b234 Configuration
+# crosstool-NG 1.24.0.385_9e10cb6 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.409_d47b234"
+CT_VERSION="1.24.0.385_9e10cb6"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="3"
 CT_CONFIG_VERSION_CURRENT="3"
@@ -103,7 +103,6 @@ CT_PARALLEL_JOBS=0
 CT_LOAD=""
 CT_USE_PIPES=y
 CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_CXXFLAGS_FOR_BUILD=""
 CT_EXTRA_LDFLAGS_FOR_BUILD=""
 CT_EXTRA_CFLAGS_FOR_HOST=""
 CT_EXTRA_LDFLAGS_FOR_HOST=""
@@ -266,8 +265,7 @@ CT_LINUX_PATCH_GLOBAL=y
 # CT_LINUX_PATCH_LOCAL_BUNDLED is not set
 # CT_LINUX_PATCH_NONE is not set
 CT_LINUX_PATCH_ORDER="global"
-CT_LINUX_V_5_13=y
-# CT_LINUX_V_5_12 is not set
+CT_LINUX_V_5_12=y
 # CT_LINUX_V_5_11 is not set
 # CT_LINUX_V_5_10 is not set
 # CT_LINUX_V_5_9 is not set
@@ -298,7 +296,7 @@ CT_LINUX_V_5_13=y
 # CT_LINUX_V_3_10 is not set
 # CT_LINUX_V_3_4 is not set
 # CT_LINUX_V_3_2 is not set
-CT_LINUX_VERSION="5.13.1"
+CT_LINUX_VERSION="5.12.12"
 CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
 CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -481,17 +479,15 @@ CT_GLIBC_OLDEST_ABI=""
 CT_GLIBC_FORCE_UNWIND=y
 # CT_GLIBC_LOCALES is not set
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
-# CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-CT_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_GLIBC_MIN_KERNEL_VERSION="5.4.0"
-CT_GLIBC_MIN_KERNEL="5.4.0"
+CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_GLIBC_MIN_KERNEL="5.12.12"
 CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_NO is not set
 # CT_GLIBC_SSP_YES is not set
 # CT_GLIBC_SSP_ALL is not set
 # CT_GLIBC_SSP_STRONG is not set
 # CT_GLIBC_ENABLE_WERROR is not set
-# CT_GLIBC_ENABLE_COMMON_FLAG is not set
 CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -546,7 +542,7 @@ CT_GCC_V_11=y
 # CT_GCC_V_9 is not set
 # CT_GCC_V_8 is not set
 # CT_GCC_V_7 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="11.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

linux-riscv64/Dockerfile.in

@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-08-04
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 ARG QEMU_VERSION=6.0.0
 

linux-riscv64/Toolchain.cmake

@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR riscv64)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_triple "riscv64-unknown-linux-gnu")
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

linux-riscv64/crosstool-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.409_d47b234 Configuration
+# crosstool-NG 1.24.0.385_9e10cb6 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.409_d47b234"
+CT_VERSION="1.24.0.385_9e10cb6"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="3"
 CT_CONFIG_VERSION_CURRENT="3"
@@ -103,7 +103,6 @@ CT_PARALLEL_JOBS=0
 CT_LOAD=""
 CT_USE_PIPES=y
 CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_CXXFLAGS_FOR_BUILD=""
 CT_EXTRA_LDFLAGS_FOR_BUILD=""
 CT_EXTRA_CFLAGS_FOR_HOST=""
 CT_EXTRA_LDFLAGS_FOR_HOST=""
@@ -266,8 +265,7 @@ CT_LINUX_PATCH_GLOBAL=y
 # CT_LINUX_PATCH_LOCAL_BUNDLED is not set
 # CT_LINUX_PATCH_NONE is not set
 CT_LINUX_PATCH_ORDER="global"
-CT_LINUX_V_5_13=y
-# CT_LINUX_V_5_12 is not set
+CT_LINUX_V_5_12=y
 # CT_LINUX_V_5_11 is not set
 # CT_LINUX_V_5_10 is not set
 # CT_LINUX_V_5_9 is not set
@@ -298,7 +296,7 @@ CT_LINUX_V_5_13=y
 # CT_LINUX_V_3_10 is not set
 # CT_LINUX_V_3_4 is not set
 # CT_LINUX_V_3_2 is not set
-CT_LINUX_VERSION="5.13.1"
+CT_LINUX_VERSION="5.12.12"
 CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
 CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -481,17 +479,15 @@ CT_GLIBC_OLDEST_ABI=""
 CT_GLIBC_FORCE_UNWIND=y
 # CT_GLIBC_LOCALES is not set
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
-# CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-CT_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_GLIBC_MIN_KERNEL_VERSION="5.4.0"
-CT_GLIBC_MIN_KERNEL="5.4.0"
+CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_GLIBC_MIN_KERNEL="5.12.12"
 CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_NO is not set
 # CT_GLIBC_SSP_YES is not set
 # CT_GLIBC_SSP_ALL is not set
 # CT_GLIBC_SSP_STRONG is not set
 # CT_GLIBC_ENABLE_WERROR is not set
-# CT_GLIBC_ENABLE_COMMON_FLAG is not set
 CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -546,7 +542,7 @@ CT_GCC_V_11=y
 # CT_GCC_V_9 is not set
 # CT_GCC_V_8 is not set
 # CT_GCC_V_7 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="11.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

linux-s390x/Dockerfile.in

@@ -4,8 +4,8 @@ FROM dockcross/base:latest
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-08-04
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 #include "common.crosstool"
 

linux-s390x/Toolchain.cmake

@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR s390x)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_triple "s390x-ibm-linux-gnu")
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

linux-s390x/crosstool-ng.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.24.0.409_d47b234 Configuration
+# crosstool-NG 1.24.0.385_9e10cb6 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -27,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.24.0.409_d47b234"
+CT_VERSION="1.24.0.385_9e10cb6"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="3"
 CT_CONFIG_VERSION_CURRENT="3"
@@ -99,7 +99,6 @@ CT_PARALLEL_JOBS=0
 CT_LOAD=""
 CT_USE_PIPES=y
 CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_CXXFLAGS_FOR_BUILD=""
 CT_EXTRA_LDFLAGS_FOR_BUILD=""
 CT_EXTRA_CFLAGS_FOR_HOST=""
 CT_EXTRA_LDFLAGS_FOR_HOST=""
@@ -243,8 +242,7 @@ CT_LINUX_PKG_NAME="linux"
 CT_LINUX_SRC_RELEASE=y
 # CT_LINUX_SRC_DEVEL is not set
 CT_LINUX_PATCH_ORDER="global"
-CT_LINUX_V_5_13=y
-# CT_LINUX_V_5_12 is not set
+CT_LINUX_V_5_12=y
 # CT_LINUX_V_5_11 is not set
 # CT_LINUX_V_5_10 is not set
 # CT_LINUX_V_5_9 is not set
@@ -275,7 +273,7 @@ CT_LINUX_V_5_13=y
 # CT_LINUX_V_3_10 is not set
 # CT_LINUX_V_3_4 is not set
 # CT_LINUX_V_3_2 is not set
-CT_LINUX_VERSION="5.13.1"
+CT_LINUX_VERSION="5.12.12"
 CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
 CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -450,17 +448,15 @@ CT_GLIBC_OLDEST_ABI=""
 CT_GLIBC_FORCE_UNWIND=y
 # CT_GLIBC_LOCALES is not set
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
-# CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-CT_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_GLIBC_MIN_KERNEL_VERSION="5.4.0"
-CT_GLIBC_MIN_KERNEL="5.4.0"
+CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_GLIBC_MIN_KERNEL="5.12.12"
 CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_NO is not set
 # CT_GLIBC_SSP_YES is not set
 # CT_GLIBC_SSP_ALL is not set
 # CT_GLIBC_SSP_STRONG is not set
 # CT_GLIBC_ENABLE_WERROR is not set
-# CT_GLIBC_ENABLE_COMMON_FLAG is not set
 CT_ALL_LIBC_CHOICES="AVR_LIBC BIONIC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
@@ -508,7 +504,7 @@ CT_GCC_V_11=y
 # CT_GCC_V_8 is not set
 # CT_GCC_V_7 is not set
 # CT_GCC_V_6 is not set
-CT_GCC_VERSION="11.2.0"
+CT_GCC_VERSION="11.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"

linux-x64-clang/Toolchain.cmake

@@ -2,8 +2,7 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_triple "x86_64-linux-gnu")
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

linux-x64-tinycc/Dockerfile.in

@@ -1,37 +0,0 @@
-FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
-
-# This image use Tinycc as C compiler and GCC as C++ compiler
-
-ARG REPO_URL=https://repo.or.cz/tinycc.git
-ENV REPO_URL=${REPO_URL}
-
-# Disable options: --with-libgcc --disable-static
-RUN git clone --recurse-submodules --remote-submodules ${REPO_URL} \
-    && cd tinycc \
-    && ./configure --cpu=x86_64 \
-    && make -j$(nproc) \
-    && make test \
-    && make install
-
-ENV PATH="/usr/local/bin:${PATH}"
-
-# Test if compiler work
-RUN tcc -v
-
-ENV CROSS_TRIPLE x86_64-linux-gnu
-ENV CROSS_ROOT /usr/bin
-ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
-    AR=/usr/bin/${CROSS_TRIPLE}-ar \
-    CC=/usr/local/bin/tcc \
-    CPP=/usr/bin/${CROSS_TRIPLE}-cpp \
-    CXX=/usr/bin/${CROSS_TRIPLE}-g++ \
-    LD=/usr/bin/${CROSS_TRIPLE}-ld \
-    FC=/usr/bin/${CROSS_TRIPLE}-gfortran
-
-COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
-
-COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
-ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
-
-#include "common.label-and-env"

linux-x64-tinycc/Toolchain.cmake

@@ -1,12 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR x86_64)
-
-set(cross_triple $ENV{CROSS_TRIPLE})
-
-set(CMAKE_C_COMPILER $ENV{CC})
-set(CMAKE_CXX_COMPILER $ENV{CXX})
-set(CMAKE_Fortran_COMPILER $ENV{FC})
-set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
-
-set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/${cross_triple}-noop)

linux-x64-tinycc/x86_64-linux-gnu-noop.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "$@"

linux-x86_64-full/Dockerfile.in

@@ -1,42 +0,0 @@
-FROM dockcross/base:latest
-
-# This is for 64-bit x86 Linux machine
-
-# Buildroot version
-# crosstool-ng master 2021-08-21
-ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01
-
-#include "common.buildroot"
-
-# The cross-compiling emulator
-RUN apt-get update \
-&& apt-get install -y \
-  qemu-user \
-  qemu-user-static \
-&& apt-get clean --yes
-
-# The CROSS_TRIPLE is a configured alias of the "x86_64-buildroot-linux-gnu" target.
-ENV CROSS_TRIPLE x86_64-buildroot-linux-gnu
-ENV CROSS_ROOT /buildroot
-ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
-    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
-    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
-
-ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
-ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
-
-COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
-
-#ENV PKG_CONFIG_PATH /usr/lib/x86_64-linux-gnu/pkgconfig
-
-# Linux kernel cross compilation variables
-ENV PATH ${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE ${CROSS_TRIPLE}-
-ENV ARCH arm64
-
-#include "common.label-and-env"

linux-x86_64-full/Toolchain.cmake

@@ -1,21 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR x86_64)
-
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
-
-set(CMAKE_C_COMPILER $ENV{CC})
-set(CMAKE_CXX_COMPILER $ENV{CXX})
-set(CMAKE_Fortran_COMPILER $ENV{FC})
-
-set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")
-
-set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple})
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
-
-set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot)
-
-set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-x86_64)

linux-xtensa-uclibc/Dockerfile.in

@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 ENV QEMU_VERSION 6.0.0
 

linux-xtensa-uclibc/Toolchain.cmake

@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR xtensa)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_triple "xtensa-fsf-linux-uclibc")
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

manylinux2014-aarch64/Dockerfile.in

@@ -2,7 +2,7 @@
 # run the container on a x86_64 host.
 # This image is not based on "pypa/manylinux2014_aarch64" because it would require the host to be aarch64.
 # For more details, read https://github.com/dockcross/dockcross/issues/367
-FROM dockcross/manylinux2014-x64:20210708-94745ff
+FROM dockcross/manylinux2014-x64
 
 # This is for 64-bit ARM Manylinux machine
 
@@ -23,16 +23,6 @@ RUN \
 # The CROSS_TRIPLE is a configured alias of the "aarch64-unknown-linux-gnueabi" target.
 ENV CROSS_TRIPLE aarch64-unknown-linux-gnueabi
 
-RUN cd ${XCC_PREFIX}/${CROSS_TRIPLE}/${CROSS_TRIPLE}/include && \
-    wget https://gist.githubusercontent.com/nhatminhle/5181506/raw/541482dbc61862bba8a156edaae57faa2995d791/stdatomic.h
-
-# Running scripts to cross compile python and copy libstdc++ into toolcain
-ADD manylinux2014-aarch64/xc_script /tmp/
-RUN PASS=2 /tmp/docker_setup_scrpits/copy_libstd.sh
-RUN /tmp/docker_setup_scrpits/prepare_cross_env.sh
-RUN rm -rf /tmp/docker_setup_scrpits
-RUN rm -rf /tmp/usr/
-
 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \

manylinux2014-aarch64/crosstool-ng.config

@@ -356,15 +356,15 @@ CT_CC_CORE_PASSES_NEEDED=y
 CT_CC_CORE_PASS_1_NEEDED=y
 CT_CC_CORE_PASS_2_NEEDED=y
 CT_CC_gcc=y
-CT_CC_GCC_VERSION="9.3.0"
+CT_CC_GCC_VERSION="4.8.5"
 # CT_CC_GCC_SHOW_LINARO is not set
-CT_CC_GCC_V_9_3_0=y
+CT_CC_GCC_V_4_8_5=y
 # CT_CC_GCC_V_5_4_0 is not set
 # CT_CC_GCC_V_4_9_4 is not set
-CT_CC_GCC_9_3_or_later=y
+CT_CC_GCC_4_8_or_later=y
 # CT_CC_GCC_4_9_or_later=y
-CT_CC_GCC_9_or_later=y
-CT_CC_GCC_9=y
+CT_CC_GCC_4_or_later=y
+CT_CC_GCC_4=y
 # CT_CC_GCC_6_or_later=y
 CT_CC_GCC_ENABLE_PLUGINS=y
 CT_CC_GCC_GOLD=y
@@ -463,6 +463,7 @@ CT_GETTEXT_NEEDED=y
 CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
+CT_CLOOG_NEEDED=y
 CT_MPC_NEEDED=y
 # CT_EXPAT_NEEDED=y
 CT_NCURSES_NEEDED=y
@@ -472,6 +473,7 @@ CT_GETTEXT=y
 CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
+CT_CLOOG=y
 CT_MPC=y
 # CT_EXPAT=y
 CT_NCURSES=y
@@ -486,11 +488,15 @@ CT_GMP_5_0_2_or_later=y
 CT_GMP_VERSION="6.1.2"
 CT_MPFR_V_3_1_5=y
 CT_MPFR_VERSION="3.1.5"
-CT_ISL_V_0_15=y
+CT_ISL_V_0_11_1=y
 # CT_ISL_V_0_15_or_later=y
 # CT_ISL_V_0_14_or_later=y
-CT_ISL_V_0_15_or_later=y
-CT_ISL_VERSION="0.15"
+CT_ISL_V_0_11_or_later=y
+CT_ISL_VERSION="0.11.1"
+CT_CLOOG_V_0_18_0=y
+CT_CLOOG_VERSION="0.18.0"
+# CT_CLOOG_0_18_4_or_later=y
+CT_CLOOG_0_18_or_later=y
 CT_MPC_V_1_0_3=y
 CT_MPC_VERSION="1.0.3"
 # CT_EXPAT_V_2_2_0=y

manylinux2014-aarch64/xc_script/docker_setup_scrpits/copy_libstd.sh

@@ -1,52 +0,0 @@
-#!/bin/bash
-
-# AUTHOR: odidev
-# DATE: 2021-07-20
-# DESCRIPTION: This file is invoked two times. first time from Makefile with
-#              PASS == 1 and second time in Dockerfile.in with PASS == 2. In
-#              dockcross container, the current libstdc++ is not the same as
-#              in manylinux containers. So, copying the libstdc++ form manylinux
-#              container to dockcross container. It is being done int 2 pass.
-#              during PASS == 1, the script will copy libstdc++ from manylinux
-#              container to build machine and then during PASS == 2, libstdc++
-#              will be copied from build machine to dockcross container
-
-if [ $PASS == 1 ]; then
-    echo "library location on host: " ${LIB_PATH}
-    echo "PASS 1: copying libstdc++ library on host"
-    files=$(rpm -ql libstdc++)
-    for file in ${files}; do
-        if [ -f ${file} -a ! -L ${file} -a ! -d ${file} ]; then
-            if grep -q "shared object" <<< $(file $file); then
-		install -m 0644 -D ${file} "${LIB_PATH}${file}"
-                break;
-            fi
-        fi
-    done
-    echo "Done"
-elif [ $PASS == 2 ]; then
-    echo "PASS 2: copying libstdc++ library in docker image"
-    old_libstdc_path=$(find /usr/xcc/ -name libstdc++.so*[0-9] -type f)
-    old_libstdc_directory=$(dirname "${old_libstdc_path}")
-    target_libstdc_path=$(find /tmp -name libstdc++.so*[0-9] -type f)
-    target_libstdc_filename=$(basename "${target_libstdc_path}")
-    target_libstdc_new_path=${old_libstdc_directory}/${target_libstdc_filename}
-    install -m 0555 -D ${target_libstdc_path} ${target_libstdc_new_path}
-    echo "Done"
-    links=$(find /usr/xcc/ \( -name libstdc++.so*[{0-9}] -o -name libstdc++.so \) -type l)
-    echo "Creating soft links for target libstdc++ library"
-    for link in ${links}; do
-	case "$link" in
-            (*libstdc++.so*[{0-9}].[{0-9}].[{0-9}]*)
-                target_libstdc_filename=$(basename "${target_libstdc_new_path}")
-                libstdc_link_directory=$(dirname "${link}")
-		rm -rf $link
-		target_libstdc_link_path=${libstdc_link_directory}/${target_libstdc_filename}
-                ln -sf ${target_libstdc_new_path} ${target_libstdc_link_path}
-                ;;
-            (*)
-                ln -sf ${target_libstdc_new_path} ${link}
-        esac
-    done
-    echo "Done"
-fi

manylinux2014-aarch64/xc_script/docker_setup_scrpits/prepare_cross_env.sh

@@ -1,113 +0,0 @@
-#!/bin/bash
-
-# AUTHOR: odidev
-# DATE: 2021-07-20
-# DESCRIPTION: This file intended to cross compile the python and create necessary
-#              crossenv enrironment
-
-# The current env is not compatible to build python so resetting it as
-# in quay.io/pypa/manylinux2014_x86_64 containers
-unset $(env | awk -F= '{print $1}')
-export SSL_CERT_FILE=/opt/_internal/certs.pem
-export TERM=xterm
-export LC_ALL=en_US.UTF-8
-export LD_LIBRARY_PATH=/opt/rh/devtoolset-9/root/usr/lib64:/opt/rh/devtoolset-9/root/usr/lib:/opt/rh/devtoolset-9/root/usr/lib64/dyninst:/opt/rh/devtoolset-9/root/usr/lib/dyninst:/usr/local/lib64
-export PATH=/opt/rh/devtoolset-9/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-export PWD=/work
-export LANG=en_US.UTF-8
-export AUDITWHEEL_ARCH=x86_64
-export DEVTOOLSET_ROOTPATH=/opt/rh/devtoolset-9/root
-export HOME=/root
-export SHLVL=1
-export LANGUAGE=en_US.UTF-8
-export AUDITWHEEL_PLAT=manylinux2014_aarch64
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-export AUDITWHEEL_POLICY=manylinux2014
-
-# Cross compile Python versions present in manylinux containers
-declare -A buildpy
-python_vers=""
-
-for PY in /opt/python/cp*/bin/python; do
-    ver=`$PY --version | cut -d " " -f 2`
-    python_vers="${python_vers} ${ver}"
-    cpver=cp`echo ${ver} | cut -d "." -f 1-2 | sed 's/\.//'`
-    if [ ${cpver} = "cp36" ] || [ ${cpver} = "cp37" ]; then
-        cpver="${cpver}-${cpver}m"
-    else
-        cpver="${cpver}-${cpver}"
-    fi
-    buildpy[${ver}]=${cpver}
-done
-
-
-# Adding cross compiler path in PATH env variable
-export PATH=/usr/xcc/aarch64-unknown-linux-gnueabi/bin:$PATH
-
-OLD_PATH=$PATH
-CROSS_PY_BASE=/opt/_internal
-CROSS_PY_BASE_LN=/opt/python
-BUILD_DIR=/tmp/builds
-LN=ln
-sub_rel=""
-
-# Loop over each python version and cross compile it
-for python_ver in $python_vers; do
-    rel=""
-    sub_rel=""
-    found_sub_rel=0
-    for i in ` seq ${#python_ver}`
-    do
-        c=${python_ver:$i-1:1}
-        if [[ ${c} == [a-zA-Z] ]] ; then
-            found_sub_rel=1
-        fi
-        if [[ $found_sub_rel == "0" ]]; then
-            rel=${rel}${c}
-        else
-            sub_rel=${sub_rel}${c}
-        fi
-    done
-
-    mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
-    wget https://www.python.org/ftp/python/${rel}/Python-${rel}${sub_rel}.tgz
-    tar xzf Python-${rel}${sub_rel}.tgz
-    cd Python-${rel}${sub_rel}
-
-    # Setting up build python path required by crassenv
-    BUILD_PYBIN=${CROSS_PY_BASE_LN}/${buildpy[$python_ver]}/bin
-    BUILD_PIP=${BUILD_PYBIN}/pip3
-    BUILD_PYTHON=${BUILD_PYBIN}/python3
-
-    # Setting up target python required by crossenv
-    TARGET_PYPATH=${CROSS_PY_BASE}/xc/xcpython-${python_ver}
-    TARGET_PYTHON=${TARGET_PYPATH}/bin/python3
-
-    # Setting up cross env path
-    CROSS_ENV=${CROSS_PY_BASE}/${buildpy[$python_ver]}-xc
-    CROSS_ENV_LN=${CROSS_PY_BASE_LN}/${buildpy[$python_ver]}-xc
-    CROSS_ENV_PIP=${CROSS_ENV_LN}/cross/bin/pip
-
-    # Adding build python path as it is required to
-    # configure the python for cross compilation
-    PATH=${BUILD_PYBIN}:${OLD_PATH}
-    export PATH
-
-    ./configure --prefix=${TARGET_PYPATH} \
-                --host=aarch64-unknown-linux-gnueabi \
-                --build=x86_64-linux-gnu \
-                --without-ensurepip \
-                ac_cv_buggy_getaddrinfo=no \
-                ac_cv_file__dev_ptmx=yes \
-                ac_cv_file__dev_ptc=no \
-                --enable-optimizations
-    make -j32 install
-    make install
-
-    # Create the necessary env and its link
-    ${BUILD_PIP} install --upgrade pip crossenv
-    ${BUILD_PYTHON} -m crossenv ${TARGET_PYTHON} ${CROSS_ENV}
-    ${LN} -s  ${CROSS_ENV} ${CROSS_ENV_LN}
-    ${CROSS_ENV_PIP} install wheel
-    rm -rf ${BUILD_DIR}
-done

manylinux2014-aarch64/xc_script/install_deps.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# AUTHOR: odidev
-# DATE: 2021-07-20
-# DESCRIPTION: This file will be invoked by cibuildwheel when before all is set.
-#              It will install the package in manylinux container and copy back
-#              the installed files on host machine will will be coppied to
-#              toolchain
-
-install_dir='/host/tmp/install_deps'
-packages=$(echo $1 | sed 's/\(yum\s*\|install\s*\|-y\s*\)//g')
-
-# Installing the packages
-echo "Installing dependencies: $packages"
-if $1; then
-  echo "Installed successfully"
-else
-  echo "Failed"
-  exit 1
-fi
-
-# Coping the installed files
-if list=`rpm -ql $packages`; then
-
-  echo "Copying dependencies files to prepare cross toolchain-"
-
-  for file in $list; do
-    test -f $file && echo "Copy $file --> ${install_dir}${file}"
-    test -f $file && install -m 0644 -D $file "${install_dir}${file}"
-  done
-else
-  echo $list
-  echo "Dependencies not resolved"
-  exit 1
-fi
-exit 0

manylinux2014-aarch64/xc_script/repair_wheel.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# AUTHOR:      odidev
-# DATE:        2021-07-20
-# DESCRIPTION: The wheels are cross compiled and we can't be repair in currnet
-#              environment. So, better to repair in manylinux container. So,
-#              we need to run BEFORE_ALL again in target manylinux contaner. So,
-#              instead of running BEFORE_ALL again we can copy the stored files.
-# INPUT:       $1 --> Dependeicies install path on host machine with respect to
-#                     container
-#              $2 --> Wheel repair command
-
-install_dir="$1"
-
-for file in `find $install_dir -type f`; do
-    install_path=$(echo ${file} | sed 's/^.*usr/\/usr/')
-    install -m 0644 -D ${file} ${install_path}
-done
-
-$2

tools/container-diff.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -euo pipefail
+
+# More info: https://github.com/GoogleContainerTools/container-diff
+
+if (( $# < 1 || $# > 2  )); then
+    echo "Need 1 or 2 arguments: <img1> <img2>"
+    exit 1
+fi
+
+if (( $# == 1 )); then
+    container-diff analyze $1 --type=history 2>&1 | tee -a analyze-history.txt
+    container-diff analyze $1 --type=file 2>&1 | tee -a analyze-file.txt
+    container-diff analyze $1 --type=size 2>&1 | tee -a analyze-size.txt
+    container-diff analyze $1 --type=apt 2>&1 | tee -a analyze-apt.txt
+    container-diff analyze $1 --type=pip 2>&1 | tee -a analyze-pip.txt
+
+fi
+
+if (( $# == 2 )); then
+    container-diff diff $1 $2 --type=history 2>&1 | tee -a diff-history.txt
+    container-diff diff $1 $2 --type=file 2>&1 | tee -a diff-file.txt
+    container-diff diff $1 $2 --type=size 2>&1 | tee -a diff-size.txt
+    container-diff diff $1 $2 --type=apt 2>&1 | tee -a diff-apt.txt
+    container-diff diff $1 $2 --type=pip 2>&1 | tee -a diff-pip.txt
+fi

tools/dockcross-cmake-builder.sh

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-if (( $# >= 1 )); then
-    image=$1
-    build_file=build-${image%:*}
-    shift 1
-
-    cmake_arg=$*
-    echo "cmake arg: $cmake_arg"
-
-    #echo "Pulling dockcross/$image"
-    #docker pull dockcross/"$image"
-
-    echo "Make script dockcross-$image"
-    docker run --rm dockcross/"$image" > ./dockcross-"$image"
-    chmod +x ./dockcross-"$image"
-
-    echo "Build $build_file"
-    ./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja "$cmake_arg"
-    ./dockcross-"$image" ninja -C "$build_file"
-else
-    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"
-    exit 1
-fi

tools/dockcross-make-builder.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-if (( $# >= 1 )); then
-    image=$1
-    build_file=build-${image%:*}
-    shift 1
-
-    make_arg=$*
-    echo "make arg: $make_arg"
-
-    #echo "Pulling dockcross/$image"
-    #docker pull dockcross/"$image"
-
-    echo "Make script dockcross-$image"
-    docker run --rm dockcross/"$image" > ./dockcross-"$image"
-    chmod +x ./dockcross-"$image"
-
-    echo "Build $build_file"
-    ./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
-else
-    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
-    exit 1
-fi

tools/docker-container-diff.sh

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-# More info: https://github.com/GoogleContainerTools/container-diff
-
-if (( $# < 1 || $# > 2  )); then
-    echo "Need 1 or 2 arguments: <img1> <img2>"
-    echo "For local image: daemon://<img>"
-    echo "For remote image: remote://<img>"
-    exit 1
-fi
-
-if (( $# == 1 )); then
-    container-diff analyze "$1" --type=history 2>&1 | tee -a analyze-history.txt
-    container-diff analyze "$1" --type=file 2>&1 | tee -a analyze-file.txt
-    container-diff analyze "$1" --type=size 2>&1 | tee -a analyze-size.txt
-    container-diff analyze "$1" --type=apt 2>&1 | tee -a analyze-apt.txt
-    container-diff analyze "$1" --type=pip 2>&1 | tee -a analyze-pip.txt
-
-fi
-
-if (( $# == 2 )); then
-    container-diff diff "$1" "$2" --type=history 2>&1 | tee -a diff-history.txt
-    container-diff diff "$1" "$2" --type=file 2>&1 | tee -a diff-file.txt
-    container-diff diff "$1" "$2" --type=size 2>&1 | tee -a diff-size.txt
-    container-diff diff "$1" "$2" --type=apt 2>&1 | tee -a diff-apt.txt
-    container-diff diff "$1" "$2" --type=pip 2>&1 | tee -a diff-pip.txt
-fi

web-wasm/Dockerfile.in

@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.27
+FROM emscripten/emsdk:2.0.26
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Revert back to "/bin/sh" as default shell
@@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
 
 #include "common.docker"
 
-ENV EMSCRIPTEN_VERSION 2.0.27
+ENV EMSCRIPTEN_VERSION 2.0.26
 
 ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
 ENV CC=/emsdk/upstream/emscripten/emcc \

windows-arm64/Dockerfile.in

@@ -1,28 +0,0 @@
-FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
-
-ENV XCC_PREFIX /usr/xcc
-ENV CROSS_TRIPLE aarch64-w64-mingw32
-ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}-cross
-
-ARG DOWNLOAD_URL=https://github.com/mstorsjo/llvm-mingw/releases/download/20210423/llvm-mingw-20210423-msvcrt-ubuntu-18.04-x86_64.tar.xz
-ENV DOWNLOAD_URL=${DOWNLOAD_URL}
-
-RUN mkdir -p ${CROSS_ROOT} && wget -qO- "${DOWNLOAD_URL}" | tar xJvf - --strip 1 -C ${CROSS_ROOT}/ > /dev/null
-
-ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
-    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
-    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
-
-COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
-
-# Linux kernel cross compilation variables
-ENV PATH ${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE ${CROSS_TRIPLE}-
-ENV ARCH arm64
-
-#include "common.label-and-env"

windows-arm64/Toolchain.cmake

@@ -1,19 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR aarch64)
-
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
-
-set(CMAKE_C_COMPILER $ENV{CC})
-set(CMAKE_CXX_COMPILER $ENV{CXX})
-set(CMAKE_Fortran_COMPILER $ENV{FC})
-
-set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")
-
-set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple})
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
-
-set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-aarch64)

windows-armv7/Dockerfile.in

@@ -1,28 +0,0 @@
-FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
-
-ENV XCC_PREFIX /usr/xcc
-ENV CROSS_TRIPLE armv7-w64-mingw32
-ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}-cross
-
-ARG DOWNLOAD_URL=https://github.com/mstorsjo/llvm-mingw/releases/download/20210423/llvm-mingw-20210423-msvcrt-ubuntu-18.04-x86_64.tar.xz
-ENV DOWNLOAD_URL=${DOWNLOAD_URL}
-
-RUN mkdir -p ${CROSS_ROOT} && wget -qO- "${DOWNLOAD_URL}" | tar xJvf - --strip 1 -C ${CROSS_ROOT}/ > /dev/null
-
-ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
-    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
-    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
-
-COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
-
-# Linux kernel cross compilation variables
-ENV PATH ${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE ${CROSS_TRIPLE}-
-ENV ARCH arm
-
-#include "common.label-and-env"

windows-armv7/Toolchain.cmake

@@ -1,19 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR arm)
-
-set(cross_triple $ENV{CROSS_TRIPLE})
-set(cross_root $ENV{CROSS_ROOT})
-
-set(CMAKE_C_COMPILER $ENV{CC})
-set(CMAKE_CXX_COMPILER $ENV{CXX})
-set(CMAKE_Fortran_COMPILER $ENV{FC})
-
-set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")
-
-set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple})
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
-
-set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)