Merge branch 'master' into add_buildroot

.github/workflows/main.yml

@@ -53,9 +53,9 @@ jobs:
           linux-x64-clang, linux-s390x, linux-x64, linux-x86, 
           linux-mips, linux-ppc64le, web-wasm,
           manylinux2014-x64, manylinux2014-x86,
-          windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-armv7,
+          windows-static-x64, windows-static-x64-posix, windows-static-x86, 
-          windows-shared-x64, windows-shared-x64-posix, windows-shared-x86, windows-arm64, 
+          windows-shared-x64, windows-shared-x64-posix, windows-shared-x86, 
-          linux-riscv64, linux-riscv32, linux-m68k-uclibc, linux-xtensa-uclibc, linux-x64-tinycc]
+          linux-riscv64, linux-riscv32, linux-m68k-uclibc, linux-xtensa-uclibc]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2

Makefile

@@ -15,24 +15,24 @@ 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-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-mips linux-ppc64le linux-riscv64 linux-riscv32 linux-xtensa-uclibc \
-	windows-static-x86 windows-static-x64 windows-static-x64-posix windows-armv7 \
+	windows-static-x86 windows-static-x64 windows-static-x64-posix \
-	windows-shared-x86 windows-shared-x64 windows-shared-x64-posix windows-arm64
+	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 \
 	manylinux2014-x64 manylinux2014-x86 \
-	web-wasm linux-mips windows-arm64 windows-armv7 \
+	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-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))
 

README.md

@@ -13,14 +13,13 @@ Cross compiling toolchains in Docker images.
 -   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.
+-   Make variables **CC**, **CXX**, **LD** 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.
 
 ## Examples
 
@@ -41,32 +40,26 @@ This image does not need to be run manually. Instead, there is a helper script t
 
 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/
-```
 
 Where **CROSS_COMPILER_IMAGE_NAME** is the name of the cross-compiler toolchain Docker instance, e.g: **dockcross/linux-armv7**.
 
-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'
-```
 
 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...]
-```
 
 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.
 
@@ -80,7 +73,6 @@ The dockcross script will execute the given command-line inside the container, a
 | 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 | Linux |
 | dockcross/linux-arm64-musl | ARMv8 | GCC + musl | Linux |
 | dockcross/linux-armv5 | ARMv5 | GCC | Linux |
 | dockcross/linux-armv5-musl | ARMv5 | GCC + musl | Linux |
@@ -102,7 +94,6 @@ The dockcross script will execute the given command-line inside the container, a
 | dockcross/linux-x86 | x86 | GCC | Linux |
 | dockcross/linux-x64 | x86_64 | GCC | 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 |
@@ -110,8 +101,6 @@ The dockcross script will execute the given command-line inside the container, a
 | 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 |
 
 ## Cross compilers
 
@@ -151,12 +140,6 @@ The Android NDK standalone toolchain for the x86_64 architecture.
 
 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).
-
 ### 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)
@@ -272,12 +255,6 @@ Linux clang x86_64/amd64 compiler. Since the Docker image is natively x86_64, th
 
 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)
@@ -334,18 +311,6 @@ linking.
 
 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
@@ -384,13 +349,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
-```
 
 ## Install all dockcross scripts
 
@@ -398,7 +362,6 @@ 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
@@ -409,7 +372,6 @@ for image in $(make -f dockcross-Makefile display_images); do
       docker run dockcross/$image > ~/bin/dockcross-$image && \
       chmod u+x  ~/bin/dockcross-$image
     done
-```
 
 ## Dockcross configuration
 
@@ -454,21 +416,17 @@ In order to extend Dockcross images with your own commands, one must:
 
 An example Dockerfile would be:
 
-```
     FROM dockcross/linux-armv7
 
     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.
-```
 
 ## What is the difference between **dockcross** and **dockbuild** ?
 

android-arm/Dockerfile.in

@@ -17,13 +17,12 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
     FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 
-ENV ANDROID_NDK_REVISION 23
+ENV ANDROID_NDK_REVISION 22b
-ENV ANDROID_NDK_API 23
+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 && \
+    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.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

@@ -21,13 +21,12 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
     FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 
-ENV ANDROID_NDK_REVISION 23
+ENV ANDROID_NDK_REVISION 22b
-ENV ANDROID_NDK_API 23
+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 && \
+    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.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

@@ -12,13 +12,12 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
     FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 
-ENV ANDROID_NDK_REVISION 23
+ENV ANDROID_NDK_REVISION 22b
-ENV ANDROID_NDK_API 23
+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 && \
+    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.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

@@ -12,13 +12,12 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
     FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
 
-ENV ANDROID_NDK_REVISION 23
+ENV ANDROID_NDK_REVISION 22b
-ENV ANDROID_NDK_API 23
+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 && \
+    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.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)

linux-arm64-full/Dockerfile.in

@@ -3,8 +3,7 @@ FROM dockcross/base:latest
 # This is for 64-bit ARM Linux machine
 
 # Buildroot version
-# crosstool-ng master 2021-08-20
+ENV BR_VERSION 2021.08-rc1
-ENV BR_VERSION dbe3af5532bfc2ecceca5ea2a4604a82021a8748
 
 #include "common.buildroot"
 

linux-arm64-full/Toolchain.cmake

@@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 
-set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_triple "aarch64-buildroot-linux-gnu")
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_root /buildroot)
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
@@ -13,8 +13,9 @@ 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_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 
 set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot)
 

linux-arm64-full/buildroot.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2021.08-rc2-29-gdbe3af5532 Configuration
+# Buildroot 2021.08-rc1-63-gf4961dea50 Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_HOST_GCC_AT_LEAST_4_9=y
@@ -223,7 +223,7 @@ BR2_KERNEL_HEADERS_5_13=y
 # BR2_KERNEL_HEADERS_CUSTOM_TARBALL is not set
 # BR2_KERNEL_HEADERS_CUSTOM_GIT is not set
 BR2_KERNEL_HEADERS_LATEST=y
-BR2_DEFAULT_KERNEL_HEADERS="5.13.9"
+BR2_DEFAULT_KERNEL_HEADERS="5.13.2"
 BR2_PACKAGE_LINUX_HEADERS=y
 
 #
@@ -370,7 +370,6 @@ BR2_TOOLCHAIN_HAS_SYNC_4=y
 BR2_TOOLCHAIN_HAS_SYNC_8=y
 BR2_TOOLCHAIN_HAS_LIBATOMIC=y
 BR2_TOOLCHAIN_HAS_ATOMIC=y
-BR2_TOOLCHAIN_HAS_LIBQUADMATH=y
 
 #
 # System configuration
@@ -467,13 +466,12 @@ BR2_PACKAGE_SKELETON_INIT_NONE=y
 # BR2_PACKAGE_FAAD2 is not set
 BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS=y
 BR2_PACKAGE_FFMPEG=y
-BR2_PACKAGE_FFMPEG_GPL=y
+# BR2_PACKAGE_FFMPEG_GPL is not set
-BR2_PACKAGE_FFMPEG_NONFREE=y
+# BR2_PACKAGE_FFMPEG_NONFREE is not set
 BR2_PACKAGE_FFMPEG_FFMPEG=y
 # BR2_PACKAGE_FFMPEG_FFPLAY is not set
 # BR2_PACKAGE_FFMPEG_FFPROBE is not set
 BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
-BR2_PACKAGE_FFMPEG_POSTPROC=y
 BR2_PACKAGE_FFMPEG_SWSCALE=y
 BR2_PACKAGE_FFMPEG_ENCODERS="all"
 BR2_PACKAGE_FFMPEG_DECODERS="all"
@@ -1481,6 +1479,7 @@ BR2_PACKAGE_LIBGPG_ERROR_SYSCFG="aarch64-unknown-linux-gnu"
 # BR2_PACKAGE_LIBGPGME is not set
 # BR2_PACKAGE_LIBKCAPI is not set
 # BR2_PACKAGE_LIBKSBA is not set
+# BR2_PACKAGE_LIBMCRYPT is not set
 # BR2_PACKAGE_LIBMHASH is not set
 # BR2_PACKAGE_LIBNSS is not set
 # BR2_PACKAGE_LIBOLM is not set
@@ -1901,7 +1900,7 @@ BR2_PACKAGE_EXPAT=y
 # BR2_PACKAGE_JOSE is not set
 # BR2_PACKAGE_JSMN is not set
 # BR2_PACKAGE_JSON_C is not set
-BR2_PACKAGE_JSON_FOR_MODERN_CPP=y
+# BR2_PACKAGE_JSON_FOR_MODERN_CPP is not set
 # BR2_PACKAGE_JSON_GLIB is not set
 # BR2_PACKAGE_JSONCPP is not set
 # BR2_PACKAGE_LIBBSON is not set
@@ -2369,6 +2368,7 @@ BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS=y
 # BR2_PACKAGE_GSETTINGS_DESKTOP_SCHEMAS is not set
 # BR2_PACKAGE_HAVEGED is not set
 # BR2_PACKAGE_LINUX_SYSCALL_SUPPORT is not set
+# BR2_PACKAGE_MCRYPT is not set
 # BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO is not set
 # BR2_PACKAGE_NETDATA is not set
 # BR2_PACKAGE_PROJ is not set
@@ -2533,7 +2533,7 @@ BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS=y
 # BR2_PACKAGE_NETSTAT_NAT is not set
 
 #
-# NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9
+# NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.2, dynamic library, wchar, threads, gcc >= 4.9
 #
 # BR2_PACKAGE_NFACCT is not set
 # BR2_PACKAGE_NFTABLES is not set
@@ -2841,7 +2841,7 @@ BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS=y
 BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS=y
 
 #
-# libvirt needs udev /dev management, a toolchain w/ threads, dynamic library, kernel headers >= 3.12 (4.11 for AArch64)
+# libvirt needs udev /dev management, a toolchain w/ threads, dynamic library, kernel headers >= 3.12
 #
 # BR2_PACKAGE_LXC is not set
 BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS=y
@@ -3108,6 +3108,7 @@ BR2_PACKAGE_HOST_RUSTC_ARCH="aarch64"
 BR2_PACKAGE_PROVIDES_HOST_RUSTC="host-rust-bin"
 # BR2_PACKAGE_HOST_SAM_BA is not set
 # BR2_PACKAGE_HOST_SDBUSPLUS is not set
+# BR2_PACKAGE_HOST_SENTRY_CLI is not set
 # BR2_PACKAGE_HOST_SQUASHFS is not set
 # BR2_PACKAGE_HOST_SWIG is not set
 # BR2_PACKAGE_HOST_UBOOT_TOOLS is not set
@@ -3125,8 +3126,6 @@ BR2_PACKAGE_PROVIDES_HOST_RUSTC="host-rust-bin"
 #
 # Legacy options removed in 2021.08
 #
-# BR2_PACKAGE_LIBMCRYPT is not set
-# BR2_PACKAGE_MCRYPT is not set
 # BR2_PACKAGE_PHP_EXT_MCRYPT is not set
 # BR2_BINUTILS_VERSION_2_34_X is not set
 # BR2_PACKAGE_LIBSOIL is not set

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
+# crosstool-ng master 2021-08-04
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 #include "common.crosstool"
 

linux-armv5/Dockerfile.in

@@ -6,8 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
+# crosstool-ng master 2021-08-04
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+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 "armv5-unknown-linux-gnueabi")
-set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root /usr/xcc/${cross_triple})
-set(cross_root $ENV{CROSS_ROOT})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

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
+# crosstool-ng master 2021-08-04
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+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 "armv6-unknown-linux-gnueabihf")
-set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root /usr/xcc/${cross_triple})
-set(cross_root $ENV{CROSS_ROOT})
 
 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
+# crosstool-ng master 2021-08-04
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e
 
 # This is for 32-bit ARMv6 Linux
 # Raspberry Pi is ARMv6+VFP2

linux-armv7/Dockerfile.in

@@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-# crosstool-ng master 2021-08-18
+# crosstool-ng master 2021-08-04
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+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 "armv7-unknown-linux-gnueabi")
-set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root /usr/xcc/${cross_triple})
-set(cross_root $ENV{CROSS_ROOT})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

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
+# crosstool-ng master 2021-08-04
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+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 "arm-cortexa8_neon-linux-gnueabihf")
-set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root /usr/xcc/${cross_triple})
-set(cross_root $ENV{CROSS_ROOT})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

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
+# crosstool-ng master 2021-08-04
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+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_triple "m68k-unknown-uclinux-uclibc")
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

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
+# crosstool-ng master 2021-08-04
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+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_triple "mips-unknown-linux-gnu")
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

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
+# crosstool-ng master 2021-08-04
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+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_triple "powerpc64le-unknown-linux-gnu")
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

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
+# crosstool-ng master 2021-08-04
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+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_triple "riscv32-unknown-linux-gnu")
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

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
+# crosstool-ng master 2021-08-04
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+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_triple "riscv64-unknown-linux-gnu")
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

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
+# crosstool-ng master 2021-08-04
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+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_triple "s390x-ibm-linux-gnu")
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_root /usr/xcc/${cross_triple})
 
 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-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
+# crosstool-ng master 2021-07-07
-ENV CT_VERSION 358945ff2219e37d280532522d2c62309614d162
+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_triple "xtensa-fsf-linux-uclibc")
-set(cross_root $ENV{CROSS_ROOT})
+set(cross_root /usr/xcc/${cross_triple})
 
 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})

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

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)