Change binutils version and update config

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
Fix wrong config
2026-08-14 06:06:11 +02:00 · 2024-08-04 18:31:21 +02:00 · 2024-08-03 23:45:18 +02:00 · 2024-08-03 21:20:01 +02:00 · 2024-08-03 19:57:10 +02:00 · 2024-08-03 19:54:05 +02:00
195 changed files with 1154 additions and 7009 deletions
@@ -6,7 +6,7 @@ jobs:
  stale:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v9
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          exempt-issue-milestones: 'future,alpha,beta,release,bugfix,improvement,enhancement,help wanted'
@@ -18,7 +18,7 @@ jobs:
    name: Shellcheck
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
    - name: Run ShellCheck
      uses: ludeeus/action-shellcheck@master
      with:
@@ -9,4 +9,3 @@ web-wasm/Dockerfile
 */imagefiles/*
 !imagefiles/*
 crosstool-ng/*
-llama.cpp/*
@@ -23,7 +23,7 @@ cd crosstool-ng
 Change git branch:

 ```bash
-git checkout crosstool-ng-1.27.0
+git checkout crosstool-ng-1.25.0
 ```

 Once in the **crosstool-ng** folder, you must first run the `bootstrap` script:
@@ -106,10 +106,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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-arm64)
@@ -130,12 +130,12 @@ Copy text to `Dockerfile.in` file:
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # This is for 64-bit ARM Linux machine

 # Crosstool-ng crosstool-ng-1.25.0 2022-05-13
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 #include "common.crosstool"

@@ -147,9 +147,9 @@ RUN apt-get update \
 && 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
+ENV CROSS_TRIPLE aarch64-unknown-linux-gnu

-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -158,18 +158,18 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+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
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm64

 #include "common.label-and-env"
 ```
@@ -179,15 +179,15 @@ Then you must change these lines according to the targeted architecture.
 Here you have to change the value according to the name of the toolchain (./ct-ng show-tuple):

 ```docker
-ENV CROSS_TRIPLE=aarch64-unknown-linux-gnu
+ENV CROSS_TRIPLE aarch64-unknown-linux-gnu
 ```

 These lines also need to be changed:

 ```docker
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
-ENV PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
-ENV ARCH=arm64
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+ENV PKG_CONFIG_PATH /usr/lib/aarch64-linux-gnu/pkgconfig
+ENV ARCH arm64
 ```

 Once this part is finished, there must be 3 files in the `linux-arm64` folder:
@@ -1,7 +1,7 @@
 ARG DOCKER_IMAGE=debian:bookworm-slim
 FROM $DOCKER_IMAGE

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 #include "common.debian"

@@ -3,22 +3,8 @@
 # Parameters
 #

-# Name of the docker-equivalent executable for building images.
-# OCI: open container interface.
-# Common values: docker, podman, buildah
+# Name of the docker executable
 DOCKER := $(or $(OCI_EXE), docker)
-BUILD_DOCKER := $(or $(BUILD_DOCKER), $(DOCKER))
-MANIFEST_TOOL := $(or $(MANIFEST_TOOL_EXE), manifest-tool)
-RM = --rm
-
-# Name of the docker-equivalent executable for running test containers.
-# Supports the use case:
-#
-#   DOCKER=buildah
-#   TEST_DOCKER=podman
-#
-# because buildah does not run containers.
-TEST_DOCKER := $(or $(TEST_DOCKER), $(DOCKER))

 # The build sub-command. Use:
 #
@@ -26,25 +12,21 @@ TEST_DOCKER := $(or $(TEST_DOCKER), $(DOCKER))
 #
 # to generate multi-platform images.
 BUILD_CMD := $(or $(BUILD_CMD), build)
-TAG_FLAG := $(or $(TAG_FLAG), --tag)

 # Docker organization to pull the images from
 ORG = dockcross

-# Host architecture
-HOST_ARCH := $(or $(HOST_ARCH), $(shell uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/'))
-
 # Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux2014-x64)
 BIN = ./bin

 # These images are built using the "build implicit rule"
 STANDARD_IMAGES := android-arm android-arm64 android-x86 android-x86_64 \
-	linux-i686 linux-x86 linux-x64 linux-x64-clang linux-arm64-musl linux-arm64-full \
+	linux-i686 linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl linux-arm64-full \
 	linux-armv5 linux-armv5-musl linux-armv5-uclibc linux-m68k-uclibc linux-s390x linux-x64-tinycc \
 	linux-armv6 linux-armv6-lts linux-armv6-musl linux-arm64-lts linux-mipsel-lts \
 	linux-armv7l-musl linux-armv7 linux-armv7a linux-armv7-lts linux-armv7a-lts linux-x86_64-full \
-	linux-loongarch64 linux-mips linux-mips-uclibc linux-mips-lts \
-	linux-ppc linux-ppc64le linux-ppc64le-lts linux-riscv64 linux-riscv32 linux-xtensa-uclibc \
+	linux-mips linux-mips-uclibc linux-mips-lts linux-ppc64le linux-ppc64le-lts linux-riscv64 linux-riscv32 linux-xtensa-uclibc \
+	web-wasi \
 	windows-static-x86 windows-static-x64 windows-static-x64-posix windows-armv7 \
 	windows-shared-x86 windows-shared-x64 windows-shared-x64-posix windows-arm64 \
 	bare-armv7emhf-nano_newlib
@@ -52,38 +34,33 @@ STANDARD_IMAGES := android-arm android-arm64 android-x86 android-x86_64 \
 # Generated Dockerfiles.
 GEN_IMAGES := android-arm android-arm64 \
 	linux-i686 linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl linux-arm64-full \
-	manylinux_2_28-x64 manylinux_2_34-x64 \
+	manylinux_2_28-x64 \
 	manylinux2014-x64 manylinux2014-x86 \
-	manylinux2014-aarch64 manylinux_2_28-aarch64 manylinux_2_34-aarch64 linux-arm64-lts \
-	web-wasm web-wasi web-wasi-emulated-threads web-wasi-threads \
-	linux-loongarch64 linux-mips linux-mips-uclibc linux-mips-lts windows-arm64 windows-armv7 \
+	manylinux2014-aarch64 linux-arm64-lts \
+	web-wasm web-wasi web-wasi-threads linux-mips linux-mips-uclibc linux-mips-lts windows-arm64 windows-armv7 \
 	windows-static-x86 windows-static-x64 windows-static-x64-posix \
 	windows-shared-x86 windows-shared-x64 windows-shared-x64-posix \
 	linux-armv7 linux-armv7a linux-armv7l-musl linux-armv7-lts linux-armv7a-lts linux-x86_64-full \
 	linux-armv6 linux-armv6-lts linux-armv6-musl linux-mipsel-lts \
-	linux-armv5 linux-armv5-musl linux-armv5-uclibc linux-ppc linux-ppc64le linux-ppc64le-lts linux-s390x \
+	linux-armv5 linux-armv5-musl linux-armv5-uclibc linux-ppc64le linux-ppc64le-lts linux-s390x \
 	linux-riscv64 linux-riscv32 linux-m68k-uclibc linux-x64-tinycc linux-xtensa-uclibc \
 	bare-armv7emhf-nano_newlib

-# Generate both amd64 and arm64 images
-MULTIARCH_IMAGES :=  linux-arm64 \
-	web-wasi web-wasi-emulated-threads
-
 GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))

 # These images are expected to have explicit rules for *both* build and testing
-NON_STANDARD_IMAGES := manylinux_2_28-x64 manylinux_2_34-x64 manylinux2014-x64 manylinux2014-x86 \
-		      manylinux2014-aarch64 manylinux_2_28-aarch64 manylinux_2_34-aarch64 web-wasm web-wasi-emulated-threads web-wasi-threads
+NON_STANDARD_IMAGES := manylinux_2_28-x64 manylinux2014-x64 manylinux2014-x86 \
+		      manylinux2014-aarch64 web-wasm web-wasi-threads

 # Docker composite files
-DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux2014 common.manylinux_2_28 common.manylinux_2_34 common.buildroot \
-	common.crosstool common.webassembly common.windows common-manylinux.crosstool common-manylinux_2_28.crosstool common-manylinux_2_34.crosstool common.dockcross \
+DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux2014 common.manylinux_2_28 common.buildroot \
+	common.crosstool common.webassembly 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))

 # This list all available images
-IMAGES := $(STANDARD_IMAGES) $(NON_STANDARD_IMAGES) $(MULTIARCH_IMAGES)
+IMAGES := $(STANDARD_IMAGES) $(NON_STANDARD_IMAGES)

 # Optional arguments for test runner (test/run.py) associated with "testing implicit rule"
 linux-x64-tinycc.test_ARGS = --languages C
@@ -97,6 +74,13 @@ windows-armv7.test_ARGS = --exe-suffix ".exe"
 windows-arm64.test_ARGS = --exe-suffix ".exe"
 bare-armv7emhf-nano_newlib.test_ARGS = --linker-flags="--specs=nosys.specs"

+# On CircleCI, do not attempt to delete container
+# See https://circleci.com/docs/docker-btrfs-error/
+RM = --rm
+ifeq ("$(CIRCLECI)", "true")
+	RM =
+endif
+
 # Tag images with date and Git short hash in addition to revision
 TAG := $(shell date '+%Y%m%d')-$(shell git rev-parse --short HEAD)

@@ -119,26 +103,32 @@ test: base.test $(addsuffix .test,$(IMAGES))
 #
 # Generic Targets (can specialize later).
 #
+
 $(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOSITE_PATH)
-	sed $(foreach f,$(DOCKER_COMPOSITE_SOURCES),-e '/$(f)/ r $(DOCKER_COMPOSITE_FOLDER_PATH)$(f)') $< > $@
+	sed \
+		-e '/common.docker/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.docker' \
+		-e '/common.debian/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.debian' \
+		-e '/common.manylinux_2_28/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux_2_28' \
+		-e '/common.manylinux2014/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux2014' \
+		-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.webassembly/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.webassembly' \
+		-e '/common.windows/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.windows' \
+		-e '/common.dockcross/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.dockcross' \
+		-e '/common.label-and-env/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.label-and-env' \
+		$< > $@

 #
 # web-wasm
 #
-ifeq ($(HOST_ARCH),amd64)
-  EMSCRIPTEN_HOST_ARCH_TAG = ""
-endif
-ifeq ($(HOST_ARCH),arm64)
-  EMSCRIPTEN_HOST_ARCH_TAG = "-arm64"
-endif
 web-wasm: web-wasm/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	cp -r test web-wasm/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/web-wasm:$(TAG)-$(HOST_ARCH) \
-		$(TAG_FLAG) $(ORG)/web-wasm:latest-$(HOST_ARCH) \
+	$(DOCKER) $(BUILD_CMD) -t $(ORG)/web-wasm:$(TAG) \
+		-t $(ORG)/web-wasm:latest \
 		--build-arg IMAGE=$(ORG)/web-wasm \
 		--build-arg VERSION=$(TAG) \
-		--build-arg HOST_ARCH_TAG=$(EMSCRIPTEN_HOST_ARCH_TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
@@ -148,8 +138,8 @@ web-wasm: web-wasm/Dockerfile

 web-wasm.test: web-wasm
 	cp -r test web-wasm/
-	$(TEST_DOCKER) run $(RM) $(ORG)/web-wasm:latest-$(HOST_ARCH) > $(BIN)/dockcross-web-wasm && chmod +x $(BIN)/dockcross-web-wasm
-	$(BIN)/dockcross-web-wasm -i $(ORG)/web-wasm:latest-$(HOST_ARCH) python test/run.py --exe-suffix ".js"
+	$(DOCKER) run $(RM) $(ORG)/web-wasm:latest > $(BIN)/dockcross-web-wasm && chmod +x $(BIN)/dockcross-web-wasm
+	$(BIN)/dockcross-web-wasm -i $(ORG)/web-wasm:latest python test/run.py --exe-suffix ".js"
 	rm -rf web-wasm/test

 #
@@ -158,23 +148,31 @@ web-wasm.test: web-wasm
 web-wasi-threads: web-wasi web-wasi-threads/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	cp -r test web-wasi-threads/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/web-wasi-threads:$(TAG)-$(HOST_ARCH) \
-		-t $(ORG)/web-wasi-threads:latest-$(HOST_ARCH) \
+	$(DOCKER) $(BUILD_CMD) -t $(ORG)/web-wasi-threads:$(TAG) \
+		-t $(ORG)/web-wasi-threads:latest \
 		--build-arg IMAGE=$(ORG)/web-wasi-threads \
 		--build-arg VERSION=$(TAG) \
-		--build-arg HOST_ARCH=$(HOST_ARCH) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		web-wasi-threads

+web-wasi-threads.test: web-wasi-threads
+	$(DOCKER) run $(RM) $(ORG)/web-wasi-threads:latest > $(BIN)/dockcross-web-wasi-threads \
+		&& chmod +x $(BIN)/dockcross-web-wasi-threads
+	$(BIN)/dockcross-web-wasi-threads -i $(ORG)/web-wasi-threads:latest python3 test/run.py
+	rm -rf web-wasi-threads/test
 #
 # manylinux2014-aarch64
 #
 manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile manylinux2014-x64
+	@# 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 $@/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/manylinux2014-aarch64:$(TAG) \
-		$(TAG_FLAG) $(ORG)/manylinux2014-aarch64:latest \
+	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:$(TAG) \
+		-t $(ORG)/manylinux2014-aarch64:latest \
 		--build-arg IMAGE=$(ORG)/manylinux2014-aarch64 \
 		--build-arg VERSION=$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
@@ -182,58 +180,21 @@ manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile manylinux2014-x64
 		--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
-	$(TEST_DOCKER) run $(RM) $(ORG)/manylinux2014-aarch64:latest > $(BIN)/dockcross-manylinux2014-aarch64 \
+	$(DOCKER) run $(RM) $(ORG)/manylinux2014-aarch64:latest > $(BIN)/dockcross-manylinux2014-aarch64 \
 		&& chmod +x $(BIN)/dockcross-manylinux2014-aarch64
-	$(BIN)/dockcross-manylinux2014-aarch64 -i $(ORG)/manylinux2014-aarch64:latest /opt/python/cp311-cp311/bin/python test/run.py
-
-#
-# manylinux_2_28-aarch64
-#
-manylinux_2_28-aarch64: manylinux_2_28-aarch64/Dockerfile manylinux_2_28-x64
-	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/manylinux_2_28-aarch64:$(TAG) \
-		$(TAG_FLAG) $(ORG)/manylinux_2_28-aarch64:latest \
-		--build-arg IMAGE=$(ORG)/manylinux_2_28-aarch64 \
-		--build-arg VERSION=$(TAG) \
-		--build-arg VCS_REF=`git rev-parse --short HEAD` \
-		--build-arg VCS_URL=`git config --get remote.origin.url` \
-		-f manylinux_2_28-aarch64/Dockerfile .
-	rm -rf $@/imagefiles
-
-manylinux_2_28-aarch64.test: manylinux_2_28-aarch64
-	$(TEST_DOCKER) run $(RM) $(ORG)/manylinux_2_28-aarch64:latest > $(BIN)/dockcross-manylinux_2_28-aarch64 \
-		&& chmod +x $(BIN)/dockcross-manylinux_2_28-aarch64
-	$(BIN)/dockcross-manylinux_2_28-aarch64 -i $(ORG)/manylinux_2_28-aarch64:latest /opt/python/cp311-cp311/bin/python test/run.py
-
-#
-# manylinux_2_34-aarch64
-#
-manylinux_2_34-aarch64: manylinux_2_34-aarch64/Dockerfile manylinux_2_34-x64
-	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/manylinux_2_34-aarch64:$(TAG) \
-		$(TAG_FLAG) $(ORG)/manylinux_2_34-aarch64:latest \
-		--build-arg IMAGE=$(ORG)/manylinux_2_34-aarch64 \
-		--build-arg VERSION=$(TAG) \
-		--build-arg VCS_REF=`git rev-parse --short HEAD` \
-		--build-arg VCS_URL=`git config --get remote.origin.url` \
-		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-		-f manylinux_2_34-aarch64/Dockerfile .
-	rm -rf $@/imagefiles
-
-manylinux_2_34-aarch64.test: manylinux_2_34-aarch64
-	$(TEST_DOCKER) run $(RM) $(ORG)/manylinux_2_34-aarch64:latest > $(BIN)/dockcross-manylinux_2_34-aarch64 \
-		&& chmod +x $(BIN)/dockcross-manylinux_2_34-aarch64
-	$(BIN)/dockcross-manylinux_2_34-aarch64 -i $(ORG)/manylinux_2_34-aarch64:latest /opt/python/cp311-cp311/bin/python test/run.py
+	$(BIN)/dockcross-manylinux2014-aarch64 -i $(ORG)/manylinux2014-aarch64:latest /opt/python/cp38-cp38/bin/python test/run.py

 #
 # manylinux_2_28-x64
 #
 manylinux_2_28-x64: manylinux_2_28-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/manylinux_2_28-x64:$(TAG) \
-		$(TAG_FLAG) $(ORG)/manylinux_2_28-x64:latest \
+	$(DOCKER) build -t $(ORG)/manylinux_2_28-x64:$(TAG) \
+		-t $(ORG)/manylinux_2_28-x64:latest \
 		--build-arg IMAGE=$(ORG)/manylinux_2_28-x64 \
 		--build-arg VERSION=$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
@@ -243,37 +204,17 @@ manylinux_2_28-x64: manylinux_2_28-x64/Dockerfile
 	rm -rf $@/imagefiles

 manylinux_2_28-x64.test: manylinux_2_28-x64
-	$(TEST_DOCKER) run $(RM) $(ORG)/manylinux_2_28-x64:latest > $(BIN)/dockcross-manylinux_2_28-x64 \
+	$(DOCKER) run $(RM) $(ORG)/manylinux_2_28-x64:latest > $(BIN)/dockcross-manylinux_2_28-x64 \
 		&& chmod +x $(BIN)/dockcross-manylinux_2_28-x64
 	$(BIN)/dockcross-manylinux_2_28-x64 -i $(ORG)/manylinux_2_28-x64:latest /opt/python/cp310-cp310/bin/python test/run.py

-#
-# manylinux_2_34-x64
-#
-manylinux_2_34-x64: manylinux_2_34-x64/Dockerfile
-	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(DOCKER) build -t $(ORG)/manylinux_2_34-x64:$(TAG) \
-		-t $(ORG)/manylinux_2_34-x64:latest \
-		--build-arg IMAGE=$(ORG)/manylinux_2_34-x64 \
-		--build-arg VERSION=$(TAG) \
-		--build-arg VCS_REF=`git rev-parse --short HEAD` \
-		--build-arg VCS_URL=`git config --get remote.origin.url` \
-		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-		-f manylinux_2_34-x64/Dockerfile .
-	rm -rf $@/imagefiles
-
-manylinux_2_34-x64.test: manylinux_2_34-x64
-	$(DOCKER) run $(RM) $(ORG)/manylinux_2_34-x64:latest > $(BIN)/dockcross-manylinux_2_34-x64 \
-		&& chmod +x $(BIN)/dockcross-manylinux_2_34-x64
-	$(BIN)/dockcross-manylinux_2_34-x64 -i $(ORG)/manylinux_2_34-x64:latest /opt/python/cp310-cp310/bin/python test/run.py
-
 #
 # manylinux2014-x64
 #
 manylinux2014-x64: manylinux2014-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/manylinux2014-x64:$(TAG) \
-		$(TAG_FLAG) $(ORG)/manylinux2014-x64:latest \
+	$(DOCKER) build -t $(ORG)/manylinux2014-x64:$(TAG) \
+		-t $(ORG)/manylinux2014-x64:latest \
 		--build-arg IMAGE=$(ORG)/manylinux2014-x64 \
 		--build-arg VERSION=$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
@@ -283,16 +224,16 @@ manylinux2014-x64: manylinux2014-x64/Dockerfile
 	rm -rf $@/imagefiles

 manylinux2014-x64.test: manylinux2014-x64
-	$(TEST_DOCKER) run $(RM) $(ORG)/manylinux2014-x64:latest > $(BIN)/dockcross-manylinux2014-x64 \
+	$(DOCKER) run $(RM) $(ORG)/manylinux2014-x64:latest > $(BIN)/dockcross-manylinux2014-x64 \
 		&& chmod +x $(BIN)/dockcross-manylinux2014-x64
-	$(BIN)/dockcross-manylinux2014-x64 -i $(ORG)/manylinux2014-x64:latest /opt/python/cp311-cp311/bin/python test/run.py
+	$(BIN)/dockcross-manylinux2014-x64 -i $(ORG)/manylinux2014-x64:latest /opt/python/cp38-cp38/bin/python test/run.py

 #
 # manylinux2014-x86
 #
 manylinux2014-x86: manylinux2014-x86/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/manylinux2014-x86:$(TAG) \
+	$(DOCKER) build -t $(ORG)/manylinux2014-x86:$(TAG) \
 		-t $(ORG)/manylinux2014-x86:latest \
 		--build-arg IMAGE=$(ORG)/manylinux2014-x86 \
 		--build-arg VERSION=$(TAG) \
@@ -303,32 +244,22 @@ manylinux2014-x86: manylinux2014-x86/Dockerfile
 	rm -rf $@/imagefiles

 manylinux2014-x86.test: manylinux2014-x86
-	$(TEST_DOCKER) run $(RM) $(ORG)/manylinux2014-x86:latest > $(BIN)/dockcross-manylinux2014-x86 \
+	$(DOCKER) run $(RM) $(ORG)/manylinux2014-x86:latest > $(BIN)/dockcross-manylinux2014-x86 \
 		&& chmod +x $(BIN)/dockcross-manylinux2014-x86
-	$(BIN)/dockcross-manylinux2014-x86 -i $(ORG)/manylinux2014-x86:latest /opt/python/cp311-cp311/bin/python test/run.py
+	$(BIN)/dockcross-manylinux2014-x86 -i $(ORG)/manylinux2014-x86:latest /opt/python/cp38-cp38/bin/python test/run.py

 #
-# base-$(HOST_ARCH)
+# base
 #
-base-$(HOST_ARCH): Dockerfile imagefiles/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/base:latest-$(HOST_ARCH) \
-		$(TAG_FLAG) $(ORG)/base:$(TAG)-$(HOST_ARCH) \
-		--build-arg IMAGE=$(ORG)/base \
-		--build-arg VCS_URL=`git config --get remote.origin.url` \
-		.
-
-base-$(HOST_ARCH).test: base-$(HOST_ARCH)
-	$(TEST_DOCKER) run $(RM) $(ORG)/base:latest-$(HOST_ARCH) > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base
-
 base: Dockerfile imagefiles/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/base:latest \
-		$(TAG_FLAG) $(ORG)/base:$(TAG) \
+	$(DOCKER) $(BUILD_CMD) -t $(ORG)/base:latest \
+		-t $(ORG)/base:$(TAG) \
 		--build-arg IMAGE=$(ORG)/base \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		.

 base.test: base
-	$(TEST_DOCKER) run $(RM) $(ORG)/base:latest > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base
+	$(DOCKER) run $(RM) $(ORG)/base:latest > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base

 # display
 #
@@ -343,8 +274,8 @@ $(VERBOSE).SILENT: display_images

 $(STANDARD_IMAGES): %: %/Dockerfile base
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/$@:latest \
-		$(TAG_FLAG) $(ORG)/$@:$(TAG) \
+	$(DOCKER) $(BUILD_CMD) -t $(ORG)/$@:latest \
+		-t $(ORG)/$@:$(TAG) \
 		--build-arg ORG=$(ORG) \
 		--build-arg IMAGE=$(ORG)/$@ \
 		--build-arg VERSION=$(TAG) \
@@ -354,20 +285,6 @@ $(STANDARD_IMAGES): %: %/Dockerfile base
 		$@
 	rm -rf $@/imagefiles

-$(MULTIARCH_IMAGES): %: %/Dockerfile base-$(HOST_ARCH)
-	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/$@:latest-$(HOST_ARCH) \
-		$(TAG_FLAG) $(ORG)/$@:$(TAG)-$(HOST_ARCH) \
-		--build-arg ORG=$(ORG) \
-		--build-arg IMAGE=$(ORG)/$@ \
-		--build-arg HOST_ARCH=$(HOST_ARCH) \
-		--build-arg VERSION=$(TAG) \
-		--build-arg VCS_REF=`git rev-parse --short HEAD` \
-		--build-arg VCS_URL=`git config --get remote.origin.url` \
-		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-		$@
-	rm -rf $@/imagefiles
-
 clean:
 	for d in $(IMAGES) ; do rm -rf $$d/imagefiles ; done
 	for d in $(IMAGES) ; do rm -rf $(BIN)/dockcross-$$d ; done
@@ -376,9 +293,9 @@ clean:

 purge: clean
 # Remove all untagged images
-	$(TEST_DOCKER) container ls -aq | xargs -r $(DOCKER) container rm -f
+	$(DOCKER) container ls -aq | xargs -r $(DOCKER) container rm -f
 # Remove all images with organization (ex dockcross/*)
-	$(BUILD_DOCKER) images --filter=reference='$(ORG)/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f
+	$(DOCKER) images --filter=reference='$(ORG)/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f

 # Check bash syntax
 bash-check:
@@ -390,45 +307,10 @@ bash-check:
 #
 .SECONDEXPANSION:
 $(addsuffix .test,$(STANDARD_IMAGES)): $$(basename $$@)
-	$(TEST_DOCKER) run $(RM) $(ORG)/$(basename $@):latest > $(BIN)/dockcross-$(basename $@) \
+	$(DOCKER) run $(RM) $(ORG)/$(basename $@):latest > $(BIN)/dockcross-$(basename $@) \
 		&& chmod +x $(BIN)/dockcross-$(basename $@)
 	$(BIN)/dockcross-$(basename $@) -i $(ORG)/$(basename $@):latest python3 test/run.py $($@_ARGS)

-.SECONDEXPANSION:
-$(addsuffix .test,$(MULTIARCH_IMAGES) web-wasi-threads): $$(basename $$@)
-	$(TEST_DOCKER) run $(RM) $(ORG)/$(basename $@):latest-$(HOST_ARCH) > $(BIN)/dockcross-$(basename $@) \
-		&& chmod +x $(BIN)/dockcross-$(basename $@)
-	$(BIN)/dockcross-$(basename $@) -i $(ORG)/$(basename $@):latest-$(HOST_ARCH) python3 test/run.py $($@_ARGS)
-
-.SECONDEXPANSION:
-$(addsuffix .tag-$(HOST_ARCH),$(MULTIARCH_IMAGES) web-wasi-threads web-wasm): $$(basename $$@)
-	$(BUILD_DOCKER) tag $(ORG)/$(basename $@):latest-$(HOST_ARCH) \
-		 $(ORG)/$(basename $@):$(TAG)-$(HOST_ARCH)
-
-.SECONDEXPANSION:
-$(addsuffix .push-$(HOST_ARCH),$(MULTIARCH_IMAGES) web-wasi-threads web-wasm): $$(basename $$@)
-	$(BUILD_DOCKER) push $(ORG)/$(basename $@):latest-$(HOST_ARCH) \
-		&& $(BUILD_DOCKER) push $(ORG)/$(basename $@):$(TAG)-$(HOST_ARCH)
-
-.SECONDEXPANSION:
-$(addsuffix .push,$(STANDARD_IMAGES) $(NON_STANDARD_IMAGES)): $$(basename $$@)
-	$(BUILD_DOCKER) push $(ORG)/$(basename $@):latest \
-		&& $(BUILD_DOCKER) push $(ORG)/$(basename $@):$(TAG)
-
-.SECONDEXPANSION:
-$(addsuffix .manifest,$(MULTIARCH_IMAGES) web-wasi-threads web-wasm): $$(basename $$@)
-	$(MANIFEST_TOOL) push from-args \
-		--platforms linux/amd64,linux/arm64 \
-		--template $(ORG)/$(basename $@):latest-ARCH \
-		--target $(ORG)/$(basename $@):latest
-
-.SECONDEXPANSION:
-$(addsuffix .push,$(MULTIARCH_IMAGES) web-wasi-threads web-wasm): $$(basename $$@).manifest
-	$(MANIFEST_TOOL) push from-args \
-		--platforms linux/amd64,linux/arm64 \
-		--template $(ORG)/$(basename $@):$(TAG)-ARCH \
-		--target $(ORG)/$(basename $@):$(TAG)
-
 #
 # testing prerequisites implicit rule
 #
@@ -18,8 +18,6 @@ Cross compiling toolchains in Docker images.
 - [Meson](https://mesonbuild.com) is pre-installed.
 - [Conan.io](https://www.conan.io) can be used as a package manager.
 - Toolchain files configured for CMake.
- [Rustup](https://rustup.rs/) is pre-installed.
- Some images (e.g. android) are configured for Rust.
 - 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.
@@ -32,7 +30,6 @@ Cross compiling toolchains in Docker images.
 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.
 5. `dockcross bash`: Run an interactive shell in the build environment.
-6. `dockcross cargo build`: Build the current Rust project.

 Note that commands are executed verbatim. If any shell processing for environment variable expansion or redirection is required, please use

@@ -103,13 +100,11 @@ The dockcross script will execute the given command-line inside the container, a
 | dockcross/linux-armv7-lts | ARMv7 | GCC 8.5.0 + Glibc 2.28 | Linux |
 | dockcross/linux-armv7a | ARMv7a | GCC | Linux |
 | dockcross/linux-armv7l-musl | ARMv7l | GCC + musl | Linux |
-| dockcross/linux-loongarch64 | LoongArch64 | GCC | Linux |
 | dockcross/linux-mips | mips | GCC | Linux |
 | dockcross/linux-mips-uclibc | mips | GCC + uclibc | Linux |
 | dockcross/linux-mips-lts | mips | GCC 8.5.0 + Glibc 2.28 | Linux |
 | dockcross/linux-mipsel-lts | mipsel | GCC 8.5.0 + Glibc 2.28 | Linux |
 | dockcross/linux-s390x | s390x | GCC | Linux |
-| dockcross/linux-ppc | ppc | GCC | Linux |
 | dockcross/linux-ppc64le | ppc64le | GCC | Linux |
 | dockcross/linux-ppc64le-lts | ppc64le | GCC 8.5.0 + Glibc 2.28 | Linux |
 | dockcross/linux-riscv32 | riscv32 | GCC | Linux |
@@ -117,9 +112,6 @@ The dockcross script will execute the given command-line inside the container, a
 | dockcross/linux-m68k-uclibc | m68k | GCC + uclibc | Linux |
 | dockcross/linux-xtensa-uclibc | xtensa | GCC + uclibc | Linux |
 | dockcross/manylinux_2_28-x64 | x86_64 | GCC | Linux |
-| dockcross/manylinux_2_28-aarch64 | aarch64 | GCC | Linux |
-| dockcross/manylinux_2_34-x64 | x86_64 | GCC | Linux |
-| dockcross/manylinux_2_34-aarch64 | ARMv8 | GCC | Linux |
 | dockcross/manylinux2014-x86 | x86 | GCC | Linux |
 | dockcross/manylinux2014-x64 | x86_64 | GCC | Linux |
 | dockcross/linux-i686 | x86 | GCC | Linux |
@@ -284,12 +276,6 @@ board PC with TI SoC AM3358 on board, Cortex-A8.
 Toolchain configured for ARMv7-L, using
 [musl](https://www.musl-libc.org/) as base \"libc\".

-### dockcross/linux-loongarch64
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-loongarch64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-loongarch64)
-
-Generic Linux LoongArch64 cross compiler toolchain.
-
 ### 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)
@@ -334,12 +320,6 @@ Linux risc-v 32bit cross compiler toolchain for risc-v 32bit GNU systems.

 Linux m68k cross compiler toolchain for m68k GNU systems (http://www.mac.linux-m68k.org/ and http://www.linux-m68k.org/).

-### dockcross/linux-ppc
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-ppc/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-ppc)
-
-Linux PowerPC cross compiler toolchain for CPUs like the G3, G4, etc.
-
 ### 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)
@@ -394,24 +374,6 @@ Standalone Linux i686 cross compiler.

 Docker [manylinux_2_28](https://github.com/pypa/manylinux) image for building Linux x86_64 / amd64 [Python wheel packages](http://pythonwheels.com/). It includes Python 3.6, 3.7, 3.8, 3.9, 3.10 and 3.11. 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 **MANYLINUX_2_28** to \"TRUE\" in the toolchain.

-### dockcross/manylinux_2_28-aarch64
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux_2_28-aarch64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux_2_28-aarch64)
-
-Docker [manylinux_2_28](https://github.com/pypa/manylinux) image for building Linux aarch64 / arm64 [Python wheel packages](http://pythonwheels.com/). It includes Python 3.6, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, and 3.14. 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 **MANYLINUX_2_28** to \"TRUE\" in the toolchain.
-
-### dockcross/manylinux_2_34-x64
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux_2_34-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux_2_34-x64)
-
-Docker [manylinux_2_34](https://github.com/pypa/manylinux) image for building Linux x86_64 / amd64 [Python wheel packages](http://pythonwheels.com/). It includes Python 3.8.10+, 3.9.5+, 3.10.0+. 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 **MANYLINUX_2_34** to \"TRUE\" in the toolchain.
-
-### dockcross/manylinux_2_34-aarch64
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux_2_34-aarch64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux_2_34-aarch64)
-
-Docker [manylinux_2_34](https://github.com/pypa/manylinux) image for building Linux aarch64 / arm64 [Python wheel packages](http://pythonwheels.com/). It includes CPython 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, 3.13t (free-threaded) and PyPy 3.10. 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 **MANYLINUX_2_34** to "TRUE" in the toolchain. This image is designed to run on x86_64 hosts and cross-compile for aarch64 targets using QEMU emulation.
-
 ### 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)
@@ -597,7 +559,7 @@ An example Dockerfile would be:
 ```
 FROM dockcross/linux-armv7

-ENV DEFAULT_DOCKCROSS_IMAGE=my_cool_image
+ENV DEFAULT_DOCKCROSS_IMAGE my_cool_image
 RUN apt-get install -y nano
 ```

@@ -641,14 +603,6 @@ Note that the architecture is now `aarch64` instead of `amd64`, so it runs nativ

 \-\--

-## Multi-architecture Image Creation
-
-For creating multi-architecture container images, this project uses [manifest-tool](https://github.com/estesp/manifest-tool) to create and manage manifest lists that combine platform-specific images into a single multi-platform reference. This allows container runtimes to automatically select the appropriate image based on the target architecture.
-
-The multi-architecture images are built on different architectures (amd64 and arm64) and then combined using manifest-tool's `push from-args` command, which creates manifest lists pointing to the individual platform-specific images.
-
---
-
 Credits:

 - [sdt/docker-raspberry-pi-cross-compiler](https://github.com/sdt/docker-raspberry-pi-cross-compiler), who invented the base of the **dockcross** script.
@@ -1,6 +1,6 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
-MAINTAINER Matt McCormick "matt@mmmccormick.com"
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # The cross-compiling emulator
 RUN apt-get update && apt-get install -y \
@@ -17,8 +17,8 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
    CXX=${CROSS_ROOT}/bin/clang++ \
    LD=${CROSS_ROOT}/bin/ld

-ENV ANDROID_NDK_REVISION=28b
-ENV ANDROID_API=24
+ENV ANDROID_NDK_REVISION 25b
+ENV ANDROID_API 23

 RUN mkdir -p /build && \
    cd /build && \
@@ -35,13 +35,7 @@ RUN mkdir -p /build && \
    find ${CROSS_ROOT} -exec chmod a+r '{}' \; && \
    find ${CROSS_ROOT} -executable -exec chmod a+x '{}' \;

-# Prepare Rust
-ENV PATH="/root/.cargo/bin/:$PATH"
-RUN rustup target add armv7-linux-androideabi
-COPY config.toml /root/.cargo/
-
-# Prepare CMake
 COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE=${CROSS_ROOT}/Toolchain.cmake
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

 #include "common.label-and-env"
@@ -15,10 +15,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})
 set(CMAKE_EXE_LINKER_FLAGS "-llog")
 set(CMAKE_SHARED_LINKER_FLAGS "-llog")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} $ENV{CROSS_ROOT})
+set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
 set(CMAKE_SYSROOT $ENV{CROSS_ROOT}/sysroot)

 set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)
@@ -1,5 +0,0 @@
-[build]
-target = "armv7-linux-androideabi"
-
-[target.armv7-linux-androideabi]
-linker = "/usr/arm-linux-androideabi/bin/armv7a-linux-androideabi23-clang"
@@ -1,6 +1,6 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
-MAINTAINER Matt McCormick "matt@mmmccormick.com"
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 RUN \
  echo Enabled: no >> /etc/apt/sources.list.d/debian.sources && \
  dpkg --add-architecture arm64 && \
@@ -21,8 +21,8 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
    CXX=${CROSS_ROOT}/bin/clang++ \
    LD=${CROSS_ROOT}/bin/ld

-ENV ANDROID_NDK_REVISION=28b
-ENV ANDROID_API=24
+ENV ANDROID_NDK_REVISION 25b
+ENV ANDROID_API 23

 RUN mkdir -p /build && \
    cd /build && \
@@ -39,13 +39,8 @@ RUN mkdir -p /build && \
    find ${CROSS_ROOT} -exec chmod a+r '{}' \; && \
    find ${CROSS_ROOT} -executable -exec chmod a+x '{}' \;

-# Prepare Rust
-ENV PATH="/root/.cargo/bin/:$PATH"
-RUN rustup target add aarch64-linux-android
-COPY config.toml /root/.cargo/

-# Prepare CMake
 COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE=${CROSS_ROOT}/Toolchain.cmake
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

 #include "common.label-and-env"
@@ -14,10 +14,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})
 set(CMAKE_EXE_LINKER_FLAGS "-llog")
 set(CMAKE_SHARED_LINKER_FLAGS "-llog")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} $ENV{CROSS_ROOT})
+set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
 set(CMAKE_SYSROOT $ENV{CROSS_ROOT}/sysroot)

 set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)
@@ -1,5 +0,0 @@
-[build]
-target = "aarch64-linux-android"
-
-[target.aarch64-linux-android]
-linker = "/usr/aarch64-linux-android/bin/aarch64-linux-android-clang"
@@ -11,8 +11,8 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
    CXX=${CROSS_ROOT}/bin/clang++ \
    LD=${CROSS_ROOT}/bin/ld

-ENV ANDROID_NDK_REVISION=28b
-ENV ANDROID_API=24
+ENV ANDROID_NDK_REVISION 25b
+ENV ANDROID_API 23

 RUN mkdir -p /build && \
    cd /build && \
@@ -29,14 +29,8 @@ RUN mkdir -p /build && \
    find ${CROSS_ROOT} -exec chmod a+r '{}' \; && \
    find ${CROSS_ROOT} -executable -exec chmod a+x '{}' \;

-# Prepare Rust
-ENV PATH="/root/.cargo/bin/:$PATH"
-RUN rustup target add i686-linux-android
-COPY config.toml /root/.cargo/
-
-# Prepare CMake
 COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE=${CROSS_ROOT}/Toolchain.cmake
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
@@ -50,4 +44,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
      org.label-schema.vcs-ref=$VCS_REF \
      org.label-schema.vcs-url=$VCS_URL \
      org.label-schema.schema-version="1.0"
-ENV DEFAULT_DOCKCROSS_IMAGE=${IMAGE}:${VERSION}
+ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}
@@ -14,8 +14,8 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})
 set(CMAKE_EXE_LINKER_FLAGS "-llog")
 set(CMAKE_SHARED_LINKER_FLAGS "-llog")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} $ENV{CROSS_ROOT})
+set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
 set(CMAKE_SYSROOT $ENV{CROSS_ROOT}/sysroot)
@@ -1,5 +0,0 @@
-[build]
-target = "i686-linux-android"
-
-[target.i686-linux-android]
-linker = "/usr/i686-linux-android/bin/i686-linux-android23-clang"
@@ -11,8 +11,8 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
    CXX=${CROSS_ROOT}/bin/clang++ \
    LD=${CROSS_ROOT}/bin/ld

-ENV ANDROID_NDK_REVISION=28b
-ENV ANDROID_API=24
+ENV ANDROID_NDK_REVISION 25b
+ENV ANDROID_API 23

 RUN mkdir -p /build && \
    cd /build && \
@@ -29,14 +29,8 @@ RUN mkdir -p /build && \
    find ${CROSS_ROOT} -exec chmod a+r '{}' \; && \
    find ${CROSS_ROOT} -executable -exec chmod a+x '{}' \;

-# Prepare Rust
-ENV PATH="/root/.cargo/bin/:$PATH"
-RUN rustup target add x86_64-linux-android
-COPY config.toml /root/.cargo/
-
-# Prepare CMake
 COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE=${CROSS_ROOT}/Toolchain.cmake
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
@@ -50,4 +44,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
      org.label-schema.vcs-ref=$VCS_REF \
      org.label-schema.vcs-url=$VCS_URL \
      org.label-schema.schema-version="1.0"
-ENV DEFAULT_DOCKCROSS_IMAGE=${IMAGE}:${VERSION}
+ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}
@@ -14,8 +14,8 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})
 set(CMAKE_EXE_LINKER_FLAGS "-llog")
 set(CMAKE_SHARED_LINKER_FLAGS "-llog")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} $ENV{CROSS_ROOT})
+set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
 set(CMAKE_SYSROOT $ENV{CROSS_ROOT}/sysroot)
@@ -1,5 +0,0 @@
-[build]
-target = "x86_64-linux-android"
-
-[target.x86_64-linux-android]
-linker = "/usr/x86_64-linux-android/bin/x86_64-linux-android-clang"
@@ -6,13 +6,13 @@ LABEL maintainer="Chen Tao t.clydechen@gmail.com"
 # This is for armv7e-m+fp bare metal

 # Crosstool-ng version 1.25.0
-ENV CT_VERSION=8fa98eeeff9bc53478d97ef722f366fea151ae64
+ENV CT_VERSION 8fa98eeeff9bc53478d97ef722f366fea151ae64

 #include "common.crosstool"

-ENV CROSS_TRIPLE=arm-none-eabi
+ENV CROSS_TRIPLE arm-none-eabi

-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -23,13 +23,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    OBJCOPY=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-objcopy

 COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE=${CROSS_ROOT}/Toolchain.cmake
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/arm-none-eabi/pkgconfig
+ENV PKG_CONFIG_PATH /usr/lib/arm-none-eabi/pkgconfig

 # Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=arm
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm

-#include "common.label-and-env"
+#include "common.label-and-env"
@@ -10,7 +10,7 @@ set(CMAKE_CXX_COMPILER $ENV{CXX})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@@ -119,7 +119,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -1,76 +0,0 @@
-# crosstool.common-manylinux_2_28
-#
-# Common Docker instructions to install "crosstool-ng" and build a full
-# cross-compiler suite from a crosstool-ng configuration, CROSSTOOL_CONFIG.
-#
-# This import complements the "dockcross/base" image, adding:
-# - "ct-ng", a cross-compiler building utilty.
-# - A cross-compiler suite configured in "crosstool-ng.config".
-#
-# The generated cross-compiler will have a CROSS_ROOT of:
-#   ${XCC_PREFIX}/${CROSS_TRIPLE}
-#
-# A given platform will need to supply the appropriate "crosstool-ng.config" to
-# generate its cross-compiler. This can be built using "ct-ng menuconfig" to
-# generate a configuration.
-
-ENV MANYLINUX_DEPS="glibc-devel glibc-devel.i686 libstdc++-devel glib2-devel libX11-devel libXext-devel libXrender-devel mesa-libGL-devel libICE-devel libSM-devel"
-
-ENV PYTHON_COMPILE_DEPS="python3-devel zlib-devel bzip2-devel expat-devel ncurses-devel readline-devel tk-devel gdbm-devel libdb-devel libpcap-devel xz-devel openssl-devel keyutils-libs-devel krb5-devel libcom_err-devel libidn-devel curl-devel perl-devel"
-
-ENV TOOLCHAIN_DEPS="gcc-toolset-14-binutils gcc-toolset-14-gcc gcc-toolset-14-gcc-c++ gcc-toolset-14-gcc-gfortran"
-
-# Install dependent packages required for `ct-ng`.
-RUN \
-  yum -y update && \
-  yum -y install \
-    gawk \
-    gperf \
-    help2man \
-    texinfo \
-    flex \
-    ncurses-devel \
-    glibc-static \
-    rsync \
-    systemtap-devel \
-    systemtap-sdt-devel \
-    ${TOOLCHAIN_DEPS} \
-    ${PYTHON_COMPILE_DEPS} \
-    ${MANYLINUX_DEPS} && \
-  yum clean all
-
-ENV XCC_PREFIX=/usr/xcc
-
-# Add the crosstool-ng script and image-specific toolchain configuration into
-# /dockcross/.
-#
-# Afterwards, we will leave the "ct-ng" config in the image as a reference
-# for users.
-COPY \
-  imagefiles/install-crosstool-ng-toolchain.sh \
-  imagefiles/patch/crosstool-ng/crosstool-ng-zlib-target.patch \
-  manylinux_2_28-aarch64/crosstool-ng.config \
-  /dockcross/
-
-# Copy sys/sdt.h to a clean include directory to avoid pulling in all of
-# /usr/include (which causes __float128 conflicts on AlmaLinux 8 when
-# cross-compiling for aarch64).
-RUN mkdir -p /opt/ct-ng-includes/sys && \
-  cp /usr/include/sys/sdt.h /opt/ct-ng-includes/sys/ && \
-  cp /usr/include/sys/sdt-config.h /opt/ct-ng-includes/sys/
-
-# Build and install the toolchain, cleaning up artifacts afterwards.
-RUN \
-  mkdir /dockcross/crosstool && \
-  cd /dockcross/crosstool && \
-  /dockcross/install-crosstool-ng-toolchain.sh \
-  -p "${XCC_PREFIX}" \
-  -c /dockcross/crosstool-ng.config \
-  -v "${CT_VERSION}" && \
-  rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh && \
-  # Remove sudo provided by gcc-toolset since it doesn't work with
-  # our sudo wrapper calling gosu.
-  rm -f /opt/rh/gcc-toolset-14/root/usr/bin/sudo
-
-# Restore our default workdir (from "dockcross/base").
-WORKDIR /work
@@ -1,76 +0,0 @@
-# crosstool.common-manylinux_2_34
-#
-# Common Docker instructions to install "crosstool-ng" and build a full
-# cross-compiler suite from a crosstool-ng configuration, CROSSTOOL_CONFIG.
-#
-# This import complements the "dockcross/base" image, adding:
-# - "ct-ng", a cross-compiler building utilty.
-# - A cross-compiler suite configured in "crosstool-ng.config".
-#
-# The generated cross-compiler will have a CROSS_ROOT of:
-#   ${XCC_PREFIX}/${CROSS_TRIPLE}
-#
-# A given platform will need to supply the appropriate "crosstool-ng.config" to
-# generate its cross-compiler. This can be built using "ct-ng menuconfig" to
-# generate a configuration.
-
-ENV MANYLINUX_DEPS="glibc-devel glibc-devel.i686 libstdc++-devel glib2-devel libX11-devel libXext-devel libXrender-devel mesa-libGL-devel libICE-devel libSM-devel"
-
-ENV PYTHON_COMPILE_DEPS="python-devel zlib-devel bzip2-devel expat-devel ncurses-devel readline-devel tk-devel gdbm-devel libdb-devel libpcap-devel xz-devel openssl-devel keyutils-libs-devel krb5-devel libcom_err-devel libidn-devel curl-devel perl-devel"
-
-ENV TOOLCHAIN_DEPS="gcc-toolset-14-binutils gcc-toolset-14-gcc gcc-toolset-14-gcc-c++ gcc-toolset-14-gcc-gfortran"
-
-# Install dependent packages required for `ct-ng`.
-RUN \
-  dnf -y update && \
-  dnf -y install \
-    gawk \
-    gperf \
-    help2man \
-    texinfo \
-    flex \
-    ncurses-devel \
-    glibc-static \
-    rsync \
-    systemtap-devel \
-    systemtap-sdt-devel \
-    ${TOOLCHAIN_DEPS} \
-    ${PYTHON_COMPILE_DEPS} \
-    ${MANYLINUX_DEPS} && \
-  dnf clean all
-
-ENV XCC_PREFIX=/usr/xcc
-
-# Add the crosstool-ng script and image-specific toolchain configuration into
-# /dockcross/.
-#
-# Afterwards, we will leave the "ct-ng" config in the image as a reference
-# for users.
-COPY \
-  imagefiles/install-crosstool-ng-toolchain.sh \
-  imagefiles/patch/crosstool-ng/crosstool-ng-zlib-target.patch \
-  manylinux_2_34-aarch64/crosstool-ng.config \
-  /dockcross/
-
-# Copy sys/sdt.h to a clean include directory to avoid pulling in all of
-# /usr/include (which causes __float128 conflicts on AlmaLinux 9 when
-# cross-compiling for aarch64).
-RUN mkdir -p /opt/ct-ng-includes/sys && \
-  cp /usr/include/sys/sdt.h /opt/ct-ng-includes/sys/ && \
-  cp /usr/include/sys/sdt-config.h /opt/ct-ng-includes/sys/
-
-# Build and install the toolchain, cleaning up artifacts afterwards.
-RUN \
-  mkdir /dockcross/crosstool && \
-  cd /dockcross/crosstool && \
-  /dockcross/install-crosstool-ng-toolchain.sh \
-  -p "${XCC_PREFIX}" \
-  -c /dockcross/crosstool-ng.config \
-  -v "${CT_VERSION}" && \
-  rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh && \
-  # Remove sudo provided by gcc-toolset since it doesn't work with
-  # our sudo wrapper calling gosu.
-  rm -f /opt/rh/gcc-toolset-14/root/usr/bin/sudo
-
-# Restore our default workdir (from "dockcross/base").
-WORKDIR /work
@@ -11,7 +11,6 @@ RUN \
    build-essential \
    bzip2 \
    ca-certificates \
-    ccache \
    curl \
    dirmngr \
    file \
@@ -1,25 +1,20 @@
 WORKDIR /usr/src

-ARG GIT_VERSION=2.48.1
+ARG GIT_VERSION=2.42.0

-ARG CMAKE_VERSION=3.31.5
+ARG CMAKE_VERSION=3.27.5

-ARG NINJA_VERSION=1.12.1
+ARG NINJA_VERSION=1.11.1
 ARG FLATCC_VERSION=0.6.1

-ARG LIQUIDPROMT_VERSION=v1.12.0
-
-ARG OPENSSL_VERSION=openssl-1.1.1w
-ARG OPENSSL_HASH=cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8
+ARG OPENSSL_VERSION=openssl-1.1.1o
+ARG OPENSSL_HASH=9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f

 ARG CURL_VERSION=curl-7.76.0
 ARG CURL_HASH=3b4378156ba09e224008e81dcce854b7ce4d182b1f9cfb97fe5ed9e9c18c6bd3

-ARG PERL_VERSION=perl-5.40.1
-ARG PERL_HASH=02f8c45bb379ed0c3de7514fad48c714fd46be8f0b536bfd5320050165a1ee26
-
-ENV RUSTUP_HOME=/opt/rustup
-ENV CARGO_HOME=/opt/rustup/cargo
+ARG PERL_VERSION=perl-5.32.1
+ARG PERL_HASH=03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c

 # Image build scripts
 COPY \
@@ -30,7 +25,6 @@ COPY \
  imagefiles/build-and-install-ninja.sh \
  imagefiles/build-and-install-openssl.sh \
  imagefiles/build-and-install-openssh.sh \
-  imagefiles/build-and-install-rustup.sh \
  imagefiles/install-cmake-binary.sh \
  imagefiles/install-liquidprompt-binary.sh \
  imagefiles/install-python-packages.sh \
@@ -44,16 +38,13 @@ RUN \
  /buildscripts/build-and-install-curl.sh && \
  /buildscripts/build-and-install-git.sh && \
  /buildscripts/build-and-install-cmake.sh $X86_FLAG && \
-  /buildscripts/build-and-install-rustup.sh && \
  /buildscripts/install-liquidprompt-binary.sh && \
-  PYTHON=$([ -e /opt/python/cp311-cp311/bin/python ] && echo "/opt/python/cp311-cp311/bin/python" || echo "python3") && \
+  PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \
  /buildscripts/install-python-packages.sh -python ${PYTHON} && \
  /buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \
  /buildscripts/build-and-install-flatcc.sh && \
  rm -rf /buildscripts

-ENV PATH=/opt/rustup/cargo/bin:$PATH
-
 RUN echo "root:root" | chpasswd
 WORKDIR /work
 ENTRYPOINT ["/dockcross/entrypoint.sh"]
@@ -11,4 +11,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
      org.label-schema.vcs-url=$VCS_URL \
      org.label-schema.schema-version="1.0"

-ENV DEFAULT_DOCKCROSS_IMAGE=${IMAGE}:${VERSION}
+ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}
@@ -16,7 +16,6 @@ RUN \
    wget \
    nasm \
    zip \
-    libatomic \
  && \
  yum clean all && \
  # Remove sudo provided by devtoolset since it doesn't work with
@@ -10,8 +10,6 @@ RUN \
    wget \
    nasm \
    zip \
-    perl-IPC-Cmd \
-    perl-Time-Piece \
  && \
  yum clean all

@@ -24,7 +22,7 @@ RUN \
  set -x && \
  # Remove sudo provided by devtoolset since it doesn't work with
  # our sudo wrapper calling gosu.
-  rm -f /opt/rh/gcc-toolset-14/root/usr/bin/sudo && \
+  rm -f /opt/rh/gcc-toolset-12/root/usr/bin/sudo && \
  /buildscripts/install-python-packages.sh && \
  rm -rf /buildscripts

@@ -1,35 +0,0 @@
-RUN \
-  set -x && \
-  yum upgrade -y almalinux-release && \
-  yum -y install \
-    gpg \
-    python3-devel \
-    zlib-devel \
-    gettext \
-    openssh-clients \
-    wget \
-    nasm \
-    zip \
-    perl-FindBin \
-    perl-File-Compare \
-    perl-File-Copy \
-    perl-IPC-Cmd \
-    perl-Time-Piece \
-  && \
-  yum clean all
-
-# Image build scripts
-COPY \
-  manylinux-common/install-python-packages.sh \
-  /buildscripts/
-
-RUN \
-  set -x && \
-  # Remove sudo provided by devtoolset since it doesn't work with
-  # our sudo wrapper calling gosu.
-  rm -f /opt/rh/gcc-toolset-14/root/usr/bin/sudo && \
-  /buildscripts/install-python-packages.sh && \
-  rm -rf /buildscripts
-
-# Runtime scripts
-COPY manylinux-common/pre_exec.sh /dockcross/
@@ -2,8 +2,8 @@
 #
 # Common WebAssembly tools.

-# 2024-12, version 121
-ENV BINARYEN_GIT_TAG=353b759b230dff8fb82aeb157aeb6db360d74a49
+# main 2024-04-02
+ENV BINARYEN_GIT_TAG 4e2ebbd6de6f99e5972654b3f50ddbc1c6839a73
 RUN git clone --recursive https://github.com/WebAssembly/binaryen.git && \
  cd binaryen && \
  git checkout ${BINARYEN_GIT_TAG} && \
@@ -14,7 +14,6 @@ RUN git clone --recursive https://github.com/WebAssembly/binaryen.git && \
    -DCMAKE_C_COMPILER=/usr/bin/cc \
    -DCMAKE_CXX_COMPILER=/usr/bin/c++ \
    -G Ninja \
-    -DENABLE_WERROR:BOOL=OFF \
    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
    -DCMAKE_TOOLCHAIN_FILE="" \
    ../binaryen && \
@@ -23,8 +22,8 @@ RUN git clone --recursive https://github.com/WebAssembly/binaryen.git && \
  cd ../ && \
  rm -rf binaryen*

-# main 2024-12-23
-ENV WABT_GIT_TAG=ea193b40d6d4a1a697d68ae855b2b3b3e263b377
+# main 2024-04-02
+ENV WABT_GIT_TAG 356931a867c7d642bc282fff46a1c95ab0e843f3
 RUN git clone --recurse-submodules https://github.com/WebAssembly/wabt.git && \
  cd wabt && \
  git checkout ${WABT_GIT_TAG} && \
@@ -43,13 +42,13 @@ RUN git clone --recurse-submodules https://github.com/WebAssembly/wabt.git && \
  cd ../ && \
  rm -rf wabt*

-RUN mkdir -p /wasi-runtimes
+RUN mkdir /wasi-runtimes

-ENV WASMTIME_HOME=/wasi-runtimes/wasmtime
-RUN mkdir -p ${WASMTIME_HOME} && curl https://wasmtime.dev/install.sh -sSf | bash
+ENV WASMTIME_HOME /wasi-runtimes/wasmtime
+RUN mkdir ${WASMTIME_HOME} && curl https://wasmtime.dev/install.sh -sSf | bash
 COPY imagefiles/wasmtime-pwd.sh ${WASMTIME_HOME}/bin/
 COPY imagefiles/wasmtime-pwd-threads.sh ${WASMTIME_HOME}/bin/
-ENV PATH="$WASMTIME_HOME/bin:$PATH"
+ENV PATH "$WASMTIME_HOME/bin:$PATH"

 # For wasmer
 RUN \
@@ -57,20 +56,20 @@ RUN \
  apt-get install --no-install-recommends --yes \
    libxkbcommon0

-ENV WASMER_DIR=/wasi-runtimes/wasmer
+ENV WASMER_DIR /wasi-runtimes/wasmer
 RUN curl https://get.wasmer.io -sSfL | sh
 COPY imagefiles/wasmer-pwd.sh ${WASMER_DIR}/bin/
-ENV PATH="$WASMER_DIR/bin:$PATH"
+ENV PATH "$WASMER_DIR/bin:$PATH"

-ENV WASM3_VERSION=0.5.0
+ENV WASM3_VERSION 0.5.0
 RUN mkdir -p /wasi-runtimes/wasm3/bin && \
  curl -LO https://github.com/wasm3/wasm3/releases/download/v${WASM3_VERSION}/wasm3-linux-x64.elf && \
  mv wasm3-linux-x64.elf /wasi-runtimes/wasm3/bin/wasm3 && \
  chmod +x /wasi-runtimes/wasm3/bin/wasm3
-ENV PATH="/wasi-runtimes/wasm3/bin:$PATH"
+ENV PATH "/wasi-runtimes/wasm3/bin:$PATH"

-ENV WAVM_VERSION=2022-05-14
+ENV WAVM_VERSION 2022-05-14
 RUN mkdir -p /wasi-runtimes/wavm/ && \
  curl -LO https://github.com/WAVM/WAVM/releases/download/nightly%2F${WAVM_VERSION}/wavm-0.0.0-prerelease-linux.tar.gz && \
  tar -xv -C /wasi-runtimes/wavm/ -f wavm-0.0.0-prerelease-linux.tar.gz
-ENV PATH="/wasi-runtimes/wavm/bin:$PATH"
+ENV PATH "/wasi-runtimes/wavm/bin:$PATH"
@@ -9,7 +9,7 @@
 #
 # For example:
 #
-#  ENV WINEARCH=win64
+#  ENV WINEARCH win64
 #  ARG MXE_TARGET_ARCH=x86_64
 #  ARG MXE_TARGET_THREAD=
 #  ARG MXE_TARGET_LINK=shared
@@ -18,7 +18,7 @@
 # mxe master 2024-07-27
 ARG MXE_GIT_TAG=9f349e0de62a4a68bfc0f13d835a6c685dae9daa

-ENV CMAKE_TOOLCHAIN_FILE=/usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake
+ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake

 ARG DEBIAN_FRONTEND=noninteractive

@@ -125,15 +125,14 @@ RUN \
  #
  rm -rf /tmp/wine-*

-ENV CROSS_ROOT=/usr/src/mxe/usr
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_TRIPLE=${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}
-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 PATH ${PATH}:/usr/src/mxe/usr/bin
+ENV CROSS_TRIPLE ${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}
+ENV AS=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-as \
+    AR=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ar \
+    CC=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-gcc \
+    CPP=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-cpp \
+    CXX=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-g++ \
+    LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld \
+    FC=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-gfortran

 WORKDIR /work
@@ -2,11 +2,8 @@

 set -ex

-# Get script directory
-SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
-
-# Get build utilities
-source $SCRIPT_DIR/utils.sh
+MY_DIR=$(dirname "${BASH_SOURCE[0]}")
+source $MY_DIR/utils.sh

 #
 # Function 'do_curl_build' and 'build_curl'
@@ -23,7 +20,6 @@ if [[ -z "${CURL_HASH}" ]]; then
  exit 1
 fi

-CURL_ROOT="${CURL_VERSION}"
 CURL_DOWNLOAD_URL=https://curl.haxx.se/download

 function do_curl_build {
@@ -34,16 +30,28 @@ function do_curl_build {
    make install > /dev/null
 }

+
+function build_curl {
+    local curl_fname=$1
+    check_var ${curl_fname}
+    local curl_sha256=$2
+    check_var ${curl_sha256}
+    check_var ${CURL_DOWNLOAD_URL}
+    curl --connect-timeout 30 \
+        --max-time 10 \
+        --retry 5 \
+        --retry-delay 10 \
+        --retry-max-time 30 \
+        -fsSLO ${CURL_DOWNLOAD_URL}/${curl_fname}.tar.gz
+
+    check_sha256sum ${curl_fname}.tar.gz ${curl_sha256}
+    tar -zxf ${curl_fname}.tar.gz
+    (cd curl-*/ && do_curl_build)
+    rm -rf curl-*
+}
+
 cd /usr/src
-
-fetch_source "${CURL_ROOT}.tar.gz" "${CURL_DOWNLOAD_URL}"
-check_sha256sum "${CURL_ROOT}.tar.gz" "${CURL_HASH}"
-
-tar -zxf "${CURL_ROOT}.tar.gz"
-pushd "${CURL_ROOT}"
-do_curl_build
-popd
-rm -rf "${CURL_ROOT}" "${CURL_ROOT}.tar.gz"
+build_curl "${CURL_VERSION}" "${CURL_HASH}"

 (cat /etc/ld.so.conf.d/usr-local.conf 2> /dev/null | grep -q "^/usr/local/lib$") ||
  echo '/usr/local/lib' >> /etc/ld.so.conf.d/usr-local.conf
@@ -2,12 +2,10 @@

 set -ex

-# Get script directory
-SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
-
-# Get build utilities
-source $SCRIPT_DIR/utils.sh
-
+if ! command -v curl &> /dev/null; then
+	echo >&2 'error: "curl" not found!'
+	exit 1
+fi

 if ! command -v tar &> /dev/null; then
 	echo >&2 'error: "tar" not found!'
@@ -25,20 +23,27 @@ ldconfig

 cd /usr/src

-GIT_ROOT="git-${GIT_VERSION}"
-GIT_DOWNLOAD_URL="https://mirrors.edge.kernel.org/pub/software/scm/git"
+url="https://mirrors.edge.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz"
+echo "Downloading $url"
+curl --connect-timeout 20 \
+    --max-time 10 \
+    --retry 5 \
+    --retry-delay 10 \
+    --retry-max-time 40 \
+    -# -LO $url

-fetch_source "${GIT_ROOT}.tar.gz" "${GIT_DOWNLOAD_URL}"
-tar xvzf "${GIT_ROOT}.tar.gz" --no-same-owner
+tar xvzf "git-${GIT_VERSION}.tar.gz" --no-same-owner
+rm -f "git-${GIT_VERSION}.tar.gz"

-pushd "${GIT_ROOT}"
+pushd "git-${GIT_VERSION}"
 ./configure --prefix=/usr/local --with-curl
-make -j"$(nproc)" NO_GETTEXT=YesPlease
-make NO_GETTEXT=YesPlease install
+make -j"$(nproc)"
+make install
 popd
-rm -rf "${GIT_ROOT}" "${GIT_ROOT}.tar.gz"

 ldconfig

+rm -rf "git-${GIT_VERSION}"
+
 # turn the detached message off
 git config --global advice.detachedHead false
@@ -10,12 +10,6 @@
 set -e
 set -o pipefail

-# Get script directory
-SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
-
-# Get build utilities
-source $SCRIPT_DIR/utils.sh
-
 PYTHON=python
 while [ $# -gt 0 ]; do
  case "$1" in
@@ -37,22 +31,25 @@ if [[ -z "${NINJA_VERSION}" ]]; then
 fi

 # Download
-NINJA_DOWNLOAD_URL="https://github.com/ninja-build/ninja/archive/"
-NINJA_ROOT="v${NINJA_VERSION}"
+url="https://github.com/ninja-build/ninja/archive/v${NINJA_VERSION}.tar.gz"

-fetch_source "${NINJA_ROOT}.tar.gz" "${NINJA_DOWNLOAD_URL}"
+curl --connect-timeout 30 \
+    --max-time 10 \
+    --retry 5 \
+    --retry-delay 10 \
+    --retry-max-time 30 \
+    -# -o ninja.tar.gz -LO "$url"

-# Since the archive name doesn't match the top-level directory, explicitly specify it.
-mkdir -p "${NINJA_ROOT}"
-tar xvzf "${NINJA_ROOT}.tar.gz"  --strip-components=1 -C "${NINJA_ROOT}"
+mkdir ninja
+tar -xzvf ./ninja.tar.gz --strip-components=1 -C ./ninja

 # Configure, build and install
-pushd "${NINJA_ROOT}"
+pushd ./ninja
 echo "Configuring ninja using [$PYTHON]"
 $PYTHON ./configure.py --bootstrap && ./ninja
 cp ./ninja /usr/bin/
 popd

 # Clean
-rm -rf "${NINJA_ROOT}" "${NINJA_ROOT}.tar.gz"
+rm -rf ./ninja*

@@ -39,11 +39,8 @@ while [ $# -gt 0 ]; do
  shift
 done

-# Get script directory
-SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
-
-# Get build utilities
-source $SCRIPT_DIR/utils.sh
+MY_DIR=$(dirname "${BASH_SOURCE[0]}")
+source $MY_DIR/utils.sh

 #
 # Function 'do_openssl_build' and 'build_openssl'
@@ -70,7 +67,7 @@ if [[ -z "${PERL_HASH}" ]]; then
  exit 1
 fi

-# Hash from https://www.openssl.org/source/openssl-1.1.1w.tar.gz.sha256
+# Hash from https://www.openssl.org/source/openssl-1.1.1l.tar.gz.sha256
 OPENSSL_DOWNLOAD_URL=http://www.openssl.org/source/

 PERL_DOWNLOAD_URL=https://www.cpan.org/src/5.0
@@ -87,10 +84,15 @@ function build_perl {
    local perl_sha256=$2
    check_var ${perl_sha256}
    check_var ${PERL_DOWNLOAD_URL}
+    curl --connect-timeout 30 \
+        --max-time 10 \
+        --retry 5 \
+        --retry-delay 10 \
+        --retry-max-time 30 \
+        -fsSLO ${PERL_DOWNLOAD_URL}/${perl_fname}.tar.gz

-    fetch_source "${perl_fname}.tar.gz" "${PERL_DOWNLOAD_URL}"
    check_sha256sum ${perl_fname}.tar.gz ${perl_sha256}
-    tar -xzf ${perl_fname}.tar.gz --no-same-owner
+    tar -xzf ${perl_fname}.tar.gz
    (cd ${perl_fname} && do_perl_build)
    rm -rf ${perl_fname} ${perl_fname}.tar.gz
 }
@@ -107,8 +109,13 @@ function build_openssl {
    local openssl_sha256=$2
    check_var ${openssl_sha256}
    check_var ${OPENSSL_DOWNLOAD_URL}
+    curl --connect-timeout 30 \
+        --max-time 10 \
+        --retry 5 \
+        --retry-delay 10 \
+        --retry-max-time 30 \
+        -fsSLO ${OPENSSL_DOWNLOAD_URL}/${openssl_fname}.tar.gz

-    fetch_source "${openssl_fname}.tar.gz" "${OPENSSL_DOWNLOAD_URL}"
    check_sha256sum ${openssl_fname}.tar.gz ${openssl_sha256}
    tar -xzf ${openssl_fname}.tar.gz
    (cd ${openssl_fname} && PATH=/opt/perl/bin:${PATH} do_openssl_build)
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-if ! command -v curl &> /dev/null; then
-	echo >&2 'error: "curl" not found!'
-	exit 1
-fi
-
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
@@ -24,9 +24,9 @@ has() {

 # If OCI_EXE is not already set, search for a container executor (OCI stands for "Open Container Initiative")
 if [ -z "$OCI_EXE" ]; then
-    if type -p podman >/dev/null 2>/dev/null; then
+    if which podman >/dev/null 2>/dev/null; then
        OCI_EXE=podman
-    elif type -p docker >/dev/null 2>/dev/null; then
+    elif which docker >/dev/null 2>/dev/null; then
        OCI_EXE=docker
    else
        die "Cannot find a container executor. Search for docker and podman."
@@ -218,7 +218,7 @@ elif [ -n "$CYGWIN" ]; then
    HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ;
 else
    HOST_PWD=$PWD
-    [ -L "$HOST_PWD" ] && HOST_PWD=$(readlink $HOST_PWD)
+    [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD)
 fi

 # Mount Additional Volumes
@@ -26,13 +26,8 @@ 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
-
-    # Change ownership of /dev/pts/0 to new user
-    chown "$BUILDER_UID" /dev/pts/0 2> /dev/null
-
    export HOME=/home/${BUILDER_USER}
    shopt -s dotglob
-    # Copy the rest
    cp -r /root/* $HOME/
    chown -R $BUILDER_UID:$BUILDER_GID $HOME

@@ -43,17 +38,15 @@ if [[ -n $BUILDER_UID ]] && [[ -n $BUILDER_GID ]]; then

    # Enable passwordless sudo capabilities for the user
    chown root:$BUILDER_GID "$(which gosu)"
-    chmod +s "$(which gosu)"
+    chmod +s "$(which gosu)"; sync

    # Execute project specific pre execution hook
    if [[ -e /work/.dockcross ]]; then
       gosu $BUILDER_UID:$BUILDER_GID /work/.dockcross
    fi

-    # Run the command as the specified user.  The group will be BUILDER_GID,
-    # as pulled from /etc/passwd, but will have additional groups from
-    # /etc/group.  This is necessary for manylinux to install python packages.
-    exec gosu $BUILDER_UID "$@"
+    # Run the command as the specified user/group.
+    exec gosu $BUILDER_UID:$BUILDER_GID "$@"
 else
    # Just run the command as root.
    exec "$@"
@@ -3,12 +3,6 @@
 set -ex
 set -o pipefail

-# Get script directory
-SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
-
-# Get build utilities
-source $SCRIPT_DIR/utils.sh
-
 ARCH="x86_64"

 while [ $# -gt 0 ]; do
@@ -24,6 +18,11 @@ while [ $# -gt 0 ]; do
  shift
 done

+if ! command -v curl &> /dev/null; then
+	echo >&2 'error: "curl" not found!'
+	exit 1
+fi
+
 if ! command -v tar &> /dev/null; then
 	echo >&2 'error: "tar" not found!'
 	exit 1
@@ -36,12 +35,16 @@ fi

 cd /usr/src

-CMAKE_ROOT=cmake-${CMAKE_VERSION}-linux-${ARCH}
-CMAKE_DOWNLOAD_URL=https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}
+CMAKE_ROOT=cmake-${CMAKE_VERSION}-Centos5-${ARCH}
+url=https://github.com/dockbuild/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_ROOT}.tar.gz
+echo "Downloading $url"
+curl --connect-timeout 30 \
+    --max-time 10 \
+    --retry 5 \
+    --retry-delay 10 \
+    --retry-max-time 30 \
+    -# -LO $url

-echo "Downloading ${CMAKE_DOWNLOAD_URL}/${CMAKE_ROOT}.tar.gz"
-
-fetch_source "${CMAKE_ROOT}.tar.gz" "${CMAKE_DOWNLOAD_URL}"
 tar -xzvf "${CMAKE_ROOT}.tar.gz"
 rm -f "${CMAKE_ROOT}.tar.gz"

@@ -56,7 +56,6 @@ url_key="https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$
 # download and verify the signature
 export GNUPGHOME="$(mktemp -d)"

-gpg --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
 gpg --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
 gpg --keyserver hkp://pgp.key-server.io:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
 gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
@@ -7,17 +7,12 @@ if ! command -v git &> /dev/null; then
 	exit 1
 fi

-if [[ -z "${LIQUIDPROMT_VERSION}" ]]; then
-  echo >&2 'error: LIQUIDPROMT_VERSION env. variable must be set to a non-empty value'
-  exit 1
-fi
-
 cd /usr/share

 # Remove liquidprompt if exists
 rm -rf liquidprompt

-git clone "https://github.com/nojhan/liquidprompt.git" --depth 1 -b "${LIQUIDPROMT_VERSION}" liquidprompt
+git clone "https://github.com/nojhan/liquidprompt.git" -b v_1.11

 cat << EOF >> /root/.bashrc

@@ -22,20 +22,3 @@ function check_sha256sum {
    rm -f ${fname}.sha256
 }

-function fetch_source {
-    if ! command -v curl &> /dev/null; then
-      echo >&2 'error: "curl" not found!'
-      exit 1
-    fi
-    local file=$1
-    check_var "${file}"
-    local url=$2
-    check_var "${url}"
-    curl --fail \
-         --location \
-         --silent \
-         --show-error \
-         --connect-timeout 30 --max-time 10 \
-         --retry 5 --retry-delay 10 --retry-max-time 30 \
-         -o "${file}" ${url}/${file}
-}
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash

 # Mount the PWD and the /work mount dir to enable access in try_run commands
-exec ${WASMTIME_HOME}/bin/wasmtime run -W threads=y -S threads=y,cli=y --dir=. --dir=$PWD --dir=/work/ "$@"
+exec ${WASMTIME_HOME}/bin/wasmtime -S threads=y run --dir=. --dir=$PWD --dir=/work/ "$@"
@@ -1,13 +1,13 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # This is for 64-bit ARM Linux machine

 # Buildroot version
 # buildroot master 2021-09-20
-ENV BR_VERSION=d4877e6f88d5eea54dc74b855556ffc0dd3f399f
+ENV BR_VERSION d4877e6f88d5eea54dc74b855556ffc0dd3f399f

 #include "common.buildroot"

@@ -19,8 +19,8 @@ RUN apt-get update \
 && 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 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 \
@@ -29,17 +29,17 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-#ENV PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+#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
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm64

 #include "common.label-and-env"
@@ -11,10 +11,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)

 set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot)

@@ -4,7 +4,7 @@ FROM ${ORG}/base:latest
 # This is for 64-bit ARM Linux machine (Ubuntu 18.04 or Debian 9 mini)

 # Crosstool-ng version 2022-05-19
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 #include "common.crosstool"

@@ -16,9 +16,9 @@ RUN apt-get update \
 && 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
+ENV CROSS_TRIPLE aarch64-unknown-linux-gnu

-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -27,17 +27,17 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+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
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm64

 #include "common.label-and-env"
@@ -11,10 +11,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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)
@@ -120,7 +120,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -1,16 +1,13 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-ENV XCC_PREFIX=/usr/xcc
-ENV CROSS_TRIPLE=aarch64-linux-musl
-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}-cross
+ENV XCC_PREFIX /usr/xcc
+ENV CROSS_TRIPLE aarch64-linux-musl
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}-cross

 RUN mkdir -p ${XCC_PREFIX}
-# RUN curl --max-time 15 --retry 5 -LO https://musl.cc/${CROSS_TRIPLE}-cross.tgz
-# RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
-# Mirrored for reliability.
-RUN curl --max-time 15 --retry 5 -LO https://github.com/dockcross/dockcross/releases/download/toolchain-sources/${CROSS_TRIPLE}-cross-retrieved-2025-06-07.tgz
-RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross-retrieved-2025-06-07.tgz
+RUN curl --max-time 15 --retry 5 -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz
+RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz

 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
@@ -20,19 +17,13 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

-# Prepare Rust
-ENV PATH="/root/.cargo/bin/:$PATH"
-RUN rustup target add aarch64-unknown-linux-musl && cargo install --version 0.28.0 cbindgen
-COPY config.toml /root/.cargo/
-
-# Prepare CMake
 COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE=${CROSS_ROOT}/Toolchain.cmake
+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
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm64

 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
@@ -41,9 +32,9 @@ ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
 LABEL org.label-schema.build-date=$BUILD_DATE \
-    org.label-schema.name=$IMAGE \
-    org.label-schema.version=$VERSION \
-    org.label-schema.vcs-ref=$VCS_REF \
-    org.label-schema.vcs-url=$VCS_URL \
-    org.label-schema.schema-version="1.0"
-ENV DEFAULT_DOCKCROSS_IMAGE=${IMAGE}:${VERSION}
+      org.label-schema.name=$IMAGE \
+      org.label-schema.version=$VERSION \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url=$VCS_URL \
+      org.label-schema.schema-version="1.0"
+ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}
@@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
@@ -1,7 +0,0 @@
-[build]
-target = "aarch64-unknown-linux-musl"
-
-[target.aarch64-unknown-linux-musl]
-ar = "/usr/xcc/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ar"
-linker = "/usr/xcc/aarch64-linux-musl-cross/bin/aarch64-linux-musl-ld"
-
@@ -1,13 +1,12 @@
 ARG ORG=dockcross
-ARG HOST_ARCH=amd64
-FROM ${ORG}/base:latest-${HOST_ARCH}
+FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # This is for 64-bit ARM Linux machine

 # Crosstool-ng version 2024-05-04
-ENV CT_VERSION crosstool-ng-1.27.0
+ENV CT_VERSION crosstool-ng-1.26.0

 #include "common.crosstool"

@@ -19,9 +18,9 @@ RUN apt-get update \
 && 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
+ENV CROSS_TRIPLE aarch64-unknown-linux-gnu

-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -30,17 +29,17 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+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
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm64

 #include "common.label-and-env"
@@ -11,10 +11,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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)
@@ -1,12 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.27.0 Configuration
+# crosstool-NG 1.26.0 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
 CT_CONFIGURE_has_wget=y
 CT_CONFIGURE_has_curl=y
 CT_CONFIGURE_has_ninja=y
+CT_CONFIGURE_has_rsync=y
 CT_CONFIGURE_has_make_3_81_or_newer=y
 CT_CONFIGURE_has_make_4_0_or_newer=y
 CT_CONFIGURE_has_make_4_4_or_newer=y
@@ -27,7 +28,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.27.0"
+CT_VERSION="1.26.0"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -71,7 +72,7 @@ CT_DOWNLOAD_AGENT_WGET=y
 # CT_FORBID_DOWNLOAD is not set
 # CT_FORCE_DOWNLOAD is not set
 CT_CONNECT_TIMEOUT=10
-CT_DOWNLOAD_WGET_OPTIONS="--tries=5 -nc --progress=dot:binary"
+CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=5 -nc --progress=dot:binary"
 # CT_ONLY_DOWNLOAD is not set
 # CT_USE_MIRROR is not set
 CT_VERIFY_DOWNLOAD_DIGEST=y
@@ -120,7 +121,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -138,7 +139,6 @@ CT_ARCH_ARM=y
 # CT_ARCH_NIOS2 is not set
 # CT_ARCH_POWERPC is not set
 # CT_ARCH_PRU is not set
-# CT_ARCH_RISCV is not set
 # CT_ARCH_S390 is not set
 # CT_ARCH_SH is not set
 # CT_ARCH_SPARC is not set
@@ -154,7 +154,7 @@ CT_ARCH_ARM_SHOW=y
 # Options for arm
 #
 CT_ARCH_ARM_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LM32 LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 OPENRISC PARISC POWERPC PRU RISCV S390 SH SPARC TRICORE X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
 CT_ARCH_SUFFIX=""
 # CT_OMIT_TARGET_VENDOR is not set

@@ -252,19 +252,13 @@ CT_KERNEL_LINUX_SHOW=y
 #
 CT_KERNEL_LINUX_PKG_KSYM="LINUX"
 CT_LINUX_DIR_NAME="linux"
+CT_LINUX_USE_WWW_KERNEL_ORG=y
+# CT_LINUX_USE_ORACLE is not set
+CT_LINUX_USE="LINUX"
 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_6_13 is not set
-# CT_LINUX_V_6_12 is not set
-# CT_LINUX_V_6_11 is not set
-# CT_LINUX_V_6_10 is not set
-# CT_LINUX_V_6_9 is not set
-# CT_LINUX_V_6_8 is not set
-# CT_LINUX_V_6_7 is not set
-# CT_LINUX_V_6_6 is not set
-# CT_LINUX_V_6_5 is not set
 # CT_LINUX_V_6_4 is not set
 # CT_LINUX_V_6_3 is not set
 # CT_LINUX_V_6_2 is not set
@@ -306,7 +300,7 @@ CT_LINUX_V_6_1=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="6.1.127"
+CT_LINUX_VERSION="6.1.35"
 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}"
@@ -328,7 +322,6 @@ CT_LINUX_REQUIRE_3_7_or_later=y
 CT_LINUX_later_than_3_2=y
 CT_LINUX_3_2_or_later=y
 CT_LINUX_REQUIRE_3_2_or_later=y
-CT_KERNEL_has_rsync=y
 CT_KERNEL_DEP_RSYNC=y
 CT_KERNEL_LINUX_VERBOSITY_0=y
 # CT_KERNEL_LINUX_VERBOSITY_1 is not set
@@ -363,9 +356,6 @@ CT_BINUTILS_PKG_NAME="binutils"
 CT_BINUTILS_SRC_RELEASE=y
 # CT_BINUTILS_SRC_DEVEL is not set
 CT_BINUTILS_PATCH_ORDER="global"
-# CT_BINUTILS_V_2_43 is not set
-# CT_BINUTILS_V_2_42 is not set
-# CT_BINUTILS_V_2_41 is not set
 # CT_BINUTILS_V_2_40 is not set
 # CT_BINUTILS_V_2_39 is not set
 # CT_BINUTILS_V_2_38 is not set
@@ -387,8 +377,6 @@ CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
 CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
-CT_BINUTILS_2_41_or_older=y
-CT_BINUTILS_older_than_2_41=y
 CT_BINUTILS_2_39_or_older=y
 CT_BINUTILS_older_than_2_39=y
 CT_BINUTILS_later_than_2_30=y
@@ -424,7 +412,6 @@ CT_ALL_BINUTILS_CHOICES="BINUTILS"
 # C-library
 #
 CT_LIBC_GLIBC=y
-# CT_LIBC_MUSL is not set
 # CT_LIBC_UCLIBC_NG is not set
 CT_LIBC="glibc"
 CT_LIBC_CHOICE_KSYM="GLIBC"
@@ -442,9 +429,6 @@ CT_GLIBC_PKG_NAME="glibc"
 CT_GLIBC_SRC_RELEASE=y
 # CT_GLIBC_SRC_DEVEL is not set
 CT_GLIBC_PATCH_ORDER="global"
-# CT_GLIBC_V_2_41 is not set
-# CT_GLIBC_V_2_40 is not set
-# CT_GLIBC_V_2_39 is not set
 # CT_GLIBC_V_2_38 is not set
 # CT_GLIBC_V_2_37 is not set
 CT_GLIBC_V_2_36=y
@@ -469,8 +453,6 @@ CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
 CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
-CT_GLIBC_2_41_or_older=y
-CT_GLIBC_older_than_2_41=y
 CT_GLIBC_2_38_or_older=y
 CT_GLIBC_older_than_2_38=y
 CT_GLIBC_2_37_or_older=y
@@ -525,7 +507,7 @@ CT_GLIBC_FORCE_UNWIND=y
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
 CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_GLIBC_MIN_KERNEL="6.1.127"
+CT_GLIBC_MIN_KERNEL="6.1.35"
 CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_NO is not set
 # CT_GLIBC_SSP_YES is not set
@@ -574,7 +556,6 @@ CT_GCC_PKG_NAME="gcc"
 CT_GCC_SRC_RELEASE=y
 # CT_GCC_SRC_DEVEL is not set
 CT_GCC_PATCH_ORDER="global"
-# CT_GCC_V_14 is not set
 # CT_GCC_V_13 is not set
 CT_GCC_V_12=y
 # CT_GCC_V_11 is not set
@@ -583,14 +564,12 @@ CT_GCC_V_12=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="12.4.0"
+CT_GCC_VERSION="12.3.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}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
-CT_GCC_14_or_older=y
-CT_GCC_older_than_14=y
 CT_GCC_13_or_older=y
 CT_GCC_older_than_13=y
 CT_GCC_later_than_12=y
@@ -629,20 +608,18 @@ CT_CC_GCC_CONFIG_TLS=m
 #
 CT_CC_GCC_USE_GRAPHITE=y
 CT_CC_GCC_USE_LTO=y
-CT_CC_GCC_LTO_ZSTD=y
+CT_CC_GCC_LTO_ZSTD=m

 #
 # Settings for libraries running on target
 #
 # CT_CC_GCC_ENABLE_DEFAULT_PIE is not set
 CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
-CT_CC_GCC_LIBSTDCXX=y
-CT_CC_GCC_LIBSTDCXX_HOSTED_DISABLE=y
 CT_CC_GCC_LIBMUDFLAP=y
 CT_CC_GCC_LIBGOMP=y
 CT_CC_GCC_LIBSSP=m
 # CT_CC_GCC_LIBQUADMATH is not set
-CT_CC_GCC_LIBSANITIZER=y
+# CT_CC_GCC_LIBSANITIZER is not set
 CT_CC_GCC_LIBSTDCXX_VERBOSE=m

 #
@@ -673,38 +650,6 @@ CT_CC_LANG_CXX=y
 CT_CC_LANG_FORTRAN=y
 # end of C compiler

-#
-# Linkers
-#
-
-#
-# BFD enabled in binutils
-#
-
-#
-# GOLD enabled in binutils
-#
-CT_LINKER_MOLD=y
-CT_LINKER_MOLD_PKG_KSYM="MOLD"
-CT_MOLD_DIR_NAME="mold"
-CT_MOLD_PKG_NAME="mold"
-CT_MOLD_SRC_RELEASE=y
-# CT_MOLD_SRC_DEVEL is not set
-CT_MOLD_PATCH_ORDER="global"
-CT_MOLD_V_2_36_0=y
-# CT_MOLD_V_2_33_0 is not set
-# CT_MOLD_V_2_32_0 is not set
-# CT_MOLD_V_2_31_0 is not set
-CT_MOLD_VERSION="2.36.0"
-CT_MOLD_MIRRORS="https://github.com/rui314/mold/archive/refs/tags"
-CT_MOLD_ARCHIVE_FILENAME="v@{version}"
-CT_MOLD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_MOLD_ARCHIVE_FORMATS=".tar.gz"
-CT_MOLD_SIGNATURE_FORMAT=""
-CT_LINKER_MOLD_has_cmake=y
-CT_ALL_LINKER_CHOICES="MOLD"
-# end of Linkers
-
 #
 # Debug facilities
 #
@@ -716,27 +661,18 @@ CT_GDB_PKG_NAME="gdb"
 CT_GDB_SRC_RELEASE=y
 # CT_GDB_SRC_DEVEL is not set
 CT_GDB_PATCH_ORDER="global"
-CT_GDB_V_16=y
-# CT_GDB_V_15 is not set
-# CT_GDB_V_14 is not set
-# CT_GDB_V_13 is not set
+CT_GDB_V_13=y
 # CT_GDB_V_12 is not set
 # CT_GDB_V_11 is not set
 # CT_GDB_V_10 is not set
 # CT_GDB_V_9 is not set
 # CT_GDB_V_8_3 is not set
-CT_GDB_VERSION="16.2"
+CT_GDB_VERSION="13.2"
 CT_GDB_MIRRORS="$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)"
 CT_GDB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GDB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GDB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GDB_SIGNATURE_FORMAT=""
-CT_GDB_later_than_16=y
-CT_GDB_16_or_later=y
-CT_GDB_later_than_15=y
-CT_GDB_15_or_later=y
-CT_GDB_later_than_14=y
-CT_GDB_14_or_later=y
 CT_GDB_later_than_13=y
 CT_GDB_13_or_later=y
 CT_GDB_later_than_12=y
@@ -758,7 +694,6 @@ CT_GDB_GDBSERVER=y
 # CT_GDB_NATIVE_BUILD_IPA_LIB is not set
 # CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
 CT_GDB_GDBSERVER_TOPLEVEL=y
-CT_GDB_CC_LD_LIBTOOL=y
 # CT_DEBUG_LTRACE is not set
 CT_DEBUG_STRACE=y
 CT_DEBUG_STRACE_PKG_KSYM="STRACE"
@@ -767,8 +702,8 @@ CT_STRACE_PKG_NAME="strace"
 CT_STRACE_SRC_RELEASE=y
 # CT_STRACE_SRC_DEVEL is not set
 CT_STRACE_PATCH_ORDER="global"
-CT_STRACE_V_6_13=y
-CT_STRACE_VERSION="6.13"
+CT_STRACE_V_6_4=y
+CT_STRACE_VERSION="6.4"
 CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION} https://github.com/strace/strace/releases/download/v${CT_STRACE_VERSION}"
 CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -803,21 +738,17 @@ CT_GETTEXT_PKG_NAME="gettext"
 CT_GETTEXT_SRC_RELEASE=y
 # CT_GETTEXT_SRC_DEVEL is not set
 CT_GETTEXT_PATCH_ORDER="global"
-CT_GETTEXT_V_0_23_1=y
-# CT_GETTEXT_V_0_22_5 is not set
-# CT_GETTEXT_V_0_21 is not set
+CT_GETTEXT_V_0_21=y
 # CT_GETTEXT_V_0_20_1 is not set
 # CT_GETTEXT_V_0_19_8_1 is not set
-CT_GETTEXT_VERSION="0.23.1"
+CT_GETTEXT_VERSION="0.21"
 CT_GETTEXT_MIRRORS="$(CT_Mirrors GNU gettext)"
 CT_GETTEXT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GETTEXT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GETTEXT_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GETTEXT_SIGNATURE_FORMAT="packed/.sig"
-CT_GETTEXT_later_than_0_23=y
-CT_GETTEXT_0_23_or_later=y
-CT_GETTEXT_later_than_0_21=y
 CT_GETTEXT_0_21_or_later=y
+CT_GETTEXT_0_21_or_older=y
 CT_GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG=y

 #
@@ -838,10 +769,9 @@ CT_GMP_PKG_NAME="gmp"
 CT_GMP_SRC_RELEASE=y
 # CT_GMP_SRC_DEVEL is not set
 CT_GMP_PATCH_ORDER="global"
-CT_GMP_V_6_3=y
-# CT_GMP_V_6_2 is not set
+CT_GMP_V_6_2=y
 # CT_GMP_V_6_1 is not set
-CT_GMP_VERSION="6.3.0"
+CT_GMP_VERSION="6.2.1"
 CT_GMP_MIRRORS="https://gmplib.org/download/gmp https://gmplib.org/download/gmp/archive $(CT_Mirrors GNU gmp)"
 CT_GMP_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GMP_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -912,8 +842,8 @@ CT_MPC_PKG_NAME="mpc"
 CT_MPC_SRC_RELEASE=y
 # CT_MPC_SRC_DEVEL is not set
 CT_MPC_PATCH_ORDER="global"
-CT_MPC_V_1_3=y
-CT_MPC_VERSION="1.3.1"
+CT_MPC_V_1_2=y
+CT_MPC_VERSION="1.2.1"
 CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)"
 CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -968,9 +898,8 @@ CT_ZLIB_PKG_NAME="zlib"
 CT_ZLIB_SRC_RELEASE=y
 # CT_ZLIB_SRC_DEVEL is not set
 CT_ZLIB_PATCH_ORDER="global"
-CT_ZLIB_V_1_3_1=y
-# CT_ZLIB_V_1_2_13 is not set
-CT_ZLIB_VERSION="1.3.1"
+CT_ZLIB_V_1_2_13=y
+CT_ZLIB_VERSION="1.2.13"
 CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/"
 CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -983,10 +912,9 @@ CT_ZSTD_PKG_NAME="zstd"
 CT_ZSTD_SRC_RELEASE=y
 # CT_ZSTD_SRC_DEVEL is not set
 CT_ZSTD_PATCH_ORDER="global"
-CT_ZSTD_V_1_5_6=y
-# CT_ZSTD_V_1_5_5 is not set
+CT_ZSTD_V_1_5_5=y
 # CT_ZSTD_V_1_5_2 is not set
-CT_ZSTD_VERSION="1.5.6"
+CT_ZSTD_VERSION="1.5.5"
 CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
 CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -1,14 +1,14 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
 # VFP instructions (armhf).
 # musleabi as default glibc

 # Crosstool-ng version 2022-05-19
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 #include "common.crosstool"

@@ -20,8 +20,8 @@ RUN apt-get update \
 && apt-get clean --yes

 # The CROSS_TRIPLE is a configured alias of the "armv5-unknown-linux-musleabi" target.
-ENV CROSS_TRIPLE=armv5-unknown-linux-musleabi
-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_TRIPLE armv5-unknown-linux-musleabi
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -30,17 +30,17 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/arm-linux-musleabihf/
+ENV PKG_CONFIG_PATH /usr/lib/arm-linux-musleabihf/

 # Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=arm
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm

 #include "common.label-and-env"
@@ -10,10 +10,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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-arm)
@@ -124,7 +124,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -1,10 +1,10 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # Crosstool-ng version 2022-05-19
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 # This is for compiling binaries for arm routers with uclibc (e.g ddwrt, asuswrt)
 #include "common.crosstool"
@@ -16,8 +16,8 @@ RUN apt-get update \
  qemu-user-static \
 && apt-get clean --yes

-ENV CROSS_TRIPLE=arm-unknown-linux-uclibcgnueabi
-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_TRIPLE arm-unknown-linux-uclibcgnueabi
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -26,17 +26,17 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 /usr/lib/${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE=/usr/lib/${CROSS_ROOT}/Toolchain.cmake
+ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/{CROSS_ROOT}/pkgconfig/
+ENV PKG_CONFIG_PATH /usr/lib/{CROSS_ROOT}/pkgconfig/

 # Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=arm
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm

 #include "common.label-and-env"
@@ -11,10 +11,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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-arm)
@@ -120,7 +120,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -1,13 +1,13 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
 # VFP instructions (armhf).

 # Crosstool-ng version 2022-05-19
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 #include "common.crosstool"

@@ -22,8 +22,8 @@ RUN apt-get update \


 # The CROSS_TRIPLE is a configured alias of the "aarch64-unknown-linux-gnueabi" target.
-ENV CROSS_TRIPLE=armv5-unknown-linux-gnueabi
-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_TRIPLE armv5-unknown-linux-gnueabi
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -32,17 +32,17 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabi/pkgconfig
+ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabi/pkgconfig

 # Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=arm
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm

 #include "common.label-and-env"
@@ -11,10 +11,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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-arm)
@@ -120,7 +120,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -1,10 +1,10 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # Crosstool-ng version 2022-05-19
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 # This is for 32-bit ARMv6 Linux
 # Raspberry Pi is ARMv6+VFP2
@@ -19,8 +19,8 @@ RUN apt-get update \


 # The CROSS_TRIPLE is a configured alias of the "armv6-unknown-linux-gnueabihf" target.
-ENV CROSS_TRIPLE=armv6-unknown-linux-gnueabihf
-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_TRIPLE armv6-unknown-linux-gnueabihf
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -29,17 +29,17 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/
+ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/

 # Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=arm
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm

 #include "common.label-and-env"
@@ -11,10 +11,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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-arm)
@@ -120,7 +120,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -1,16 +1,13 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-ENV XCC_PREFIX=/usr/xcc
-ENV CROSS_TRIPLE=armv6-linux-musleabihf
-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}-cross
+ENV XCC_PREFIX /usr/xcc
+ENV CROSS_TRIPLE armv6-linux-musleabihf
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}-cross

 RUN mkdir -p ${XCC_PREFIX}
-# RUN curl --max-time 15 --retry 5 -LO https://musl.cc/${CROSS_TRIPLE}-cross.tgz
-# RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
-# Mirrored for reliability
-RUN curl --max-time 15 --retry 5 -LO https://github.com/dockcross/dockcross/releases/download/toolchain-sources/${CROSS_TRIPLE}-cross-retrieved-2025-06-07.tgz
-RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross-retrieved-2025-06-07.tgz
+RUN curl --max-time 15 --retry 5 -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz
+RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz

 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
@@ -21,12 +18,12 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

 COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE=${CROSS_ROOT}/Toolchain.cmake
+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
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm

 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
@@ -40,4 +37,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
      org.label-schema.vcs-ref=$VCS_REF \
      org.label-schema.vcs-url=$VCS_URL \
      org.label-schema.schema-version="1.0"
-ENV DEFAULT_DOCKCROSS_IMAGE=${IMAGE}:${VERSION}
+ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}
@@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
@@ -1,10 +1,10 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # Crosstool-ng version 2022-05-19
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 # This is for 32-bit ARMv6 Linux
 # Raspberry Pi is ARMv6+VFP2
@@ -19,8 +19,8 @@ RUN apt-get update \


 # The CROSS_TRIPLE is a configured alias of the "armv6-unknown-linux-gnueabihf" target.
-ENV CROSS_TRIPLE=armv6-unknown-linux-gnueabihf
-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_TRIPLE armv6-unknown-linux-gnueabihf
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -29,17 +29,17 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/
+ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/

 # Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=arm
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm

 #include "common.label-and-env"
@@ -10,10 +10,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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-arm)
@@ -120,7 +120,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -1,10 +1,10 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # Crosstool-ng version 2022-05-19
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 # This is for 32-bit ARMv7 Linux
 #include "common.crosstool"
@@ -18,8 +18,8 @@ RUN apt-get update \


 # The CROSS_TRIPLE is a configured alias of the "armv7-unknown-linux-gnueabi" target.
-ENV CROSS_TRIPLE=armv7-unknown-linux-gnueabi
-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_TRIPLE armv7-unknown-linux-gnueabi
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -28,17 +28,17 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/
+ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/

 # Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=arm
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm

 #include "common.label-and-env"
@@ -11,10 +11,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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-arm)
@@ -120,7 +120,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -1,10 +1,10 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # Crosstool-ng version 2022-05-19
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 # This is for 32-bit ARMv7 Linux
 #include "common.crosstool"
@@ -18,8 +18,8 @@ RUN apt-get update \


 # The CROSS_TRIPLE is a configured alias of the "aarch64-unknown-linux-gnueabi" target.
-ENV CROSS_TRIPLE=armv7-unknown-linux-gnueabi
-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_TRIPLE armv7-unknown-linux-gnueabi
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -28,17 +28,17 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/
+ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/

 # Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=arm
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm

 #include "common.label-and-env"
@@ -11,10 +11,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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-arm)
@@ -120,7 +120,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -1,13 +1,13 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # This is for 32-bit ARMv7a Linux

 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
 # crosstool-ng 1.25.0
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 #include "common.crosstool"

@@ -20,9 +20,9 @@ RUN apt-get update \


 # The CROSS_TRIPLE is a configured alias of the "aarch64-unknown-linux-gnueabi" target.
-ENV CROSS_TRIPLE=arm-cortexa8_neon-linux-gnueabihf
+ENV CROSS_TRIPLE arm-cortexa8_neon-linux-gnueabihf

-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -31,19 +31,19 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
+ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"

-ENV DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-armv7a
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-armv7a

 COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE=${CROSS_ROOT}/Toolchain.cmake
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig
+ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/pkgconfig

 # Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=arm
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm

 #include "common.label-and-env"
@@ -11,10 +11,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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-arm)
@@ -116,7 +116,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -1,12 +1,12 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # This is for 32-bit ARMv7 Linux

 # Crosstool-ng version 2024-05-21
-ENV CT_VERSION=crosstool-ng-1.26.0
+ENV CT_VERSION crosstool-ng-1.26.0

 #include "common.crosstool"

@@ -19,9 +19,9 @@ RUN apt-get update \


 # The CROSS_TRIPLE is a configured alias of the "aarch64-unknown-linux-gnueabi" target.
-#ENV CROSS_TRIPLE=armv7-unknown-linux-gnueabi
-ENV CROSS_TRIPLE=arm-cortexa8_neon-linux-gnueabihf
-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+#ENV CROSS_TRIPLE armv7-unknown-linux-gnueabi
+ENV CROSS_TRIPLE arm-cortexa8_neon-linux-gnueabihf
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -30,19 +30,19 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
+ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"

-ENV DEFAULT_DOCKCROSS_IMAGE=dockcross/linux-armv7a
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-armv7a

 COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE=${CROSS_ROOT}/Toolchain.cmake
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/
+ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/

 # Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=arm
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm

 #include "common.label-and-env"
@@ -11,10 +11,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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-arm)
@@ -120,7 +120,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -370,11 +370,11 @@ CT_BINUTILS_PKG_NAME="binutils"
 CT_BINUTILS_SRC_RELEASE=y
 # CT_BINUTILS_SRC_DEVEL is not set
 CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_40=y
+# CT_BINUTILS_V_2_40 is not set
 # CT_BINUTILS_V_2_39 is not set
 # CT_BINUTILS_V_2_38 is not set
 # CT_BINUTILS_V_2_37 is not set
-# CT_BINUTILS_V_2_36 is not set
+CT_BINUTILS_V_2_36=y
 # CT_BINUTILS_V_2_35 is not set
 # CT_BINUTILS_V_2_34 is not set
 # CT_BINUTILS_V_2_33 is not set
@@ -385,14 +385,14 @@ CT_BINUTILS_V_2_40=y
 # CT_BINUTILS_V_2_28 is not set
 # CT_BINUTILS_V_2_27 is not set
 # CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.40"
+CT_BINUTILS_VERSION="2.36.1"
 CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
 CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
 CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
-CT_BINUTILS_later_than_2_39=y
-CT_BINUTILS_2_39_or_later=y
+CT_BINUTILS_2_39_or_older=y
+CT_BINUTILS_older_than_2_39=y
 CT_BINUTILS_later_than_2_30=y
 CT_BINUTILS_2_30_or_later=y
 CT_BINUTILS_later_than_2_27=y
@@ -1,16 +1,13 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-ENV XCC_PREFIX=/usr/xcc
-ENV CROSS_TRIPLE=armv7l-linux-musleabihf
-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}-cross
+ENV XCC_PREFIX /usr/xcc
+ENV CROSS_TRIPLE armv7l-linux-musleabihf
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}-cross

 RUN mkdir -p ${XCC_PREFIX}
-# RUN curl --max-time 15 --retry 5 -LO https://musl.cc/${CROSS_TRIPLE}-cross.tgz
-# RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz
-# Mirrored for reliability
-RUN curl --max-time 15 --retry 5 -LO https://github.com/dockcross/dockcross/releases/download/toolchain-sources/${CROSS_TRIPLE}-cross-retrieved-2025-06-07.tgz
-RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross-retrieved-2025-06-07.tgz
+RUN curl --max-time 15 --retry 5 -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz
+RUN tar -C ${XCC_PREFIX} -xvf ${CROSS_TRIPLE}-cross.tgz

 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
@@ -21,12 +18,12 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

 COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE=${CROSS_ROOT}/Toolchain.cmake
+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
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm

 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
@@ -40,4 +37,4 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
      org.label-schema.vcs-ref=$VCS_REF \
      org.label-schema.vcs-url=$VCS_URL \
      org.label-schema.schema-version="1.0"
-ENV DEFAULT_DOCKCROSS_IMAGE=${IMAGE}:${VERSION}
+ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}
@@ -11,7 +11,7 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
@@ -6,7 +6,7 @@ LABEL maintainer="PJ Reid PJ.Reid@Zetier.com"
 # This is for 32-bit (i686) intel/amd devices

 # Crosstool-ng version 2022-05-19
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 #include "common.crosstool"

@@ -18,9 +18,9 @@ RUN apt-get update \
 && apt-get clean --yes

 # The CROSS_TRIPLE is a configured alias of the "i686-linux-gnu" target.
-ENV CROSS_TRIPLE=i686-linux-gnu
+ENV CROSS_TRIPLE i686-linux-gnu

-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -29,15 +29,15 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 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=i686
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH i686

 #include "common.label-and-env"
@@ -9,10 +9,10 @@ set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
 set(CMAKE_Fortran_COMPILER $ENV{FC})

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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 -cpu qemu32)
@@ -119,7 +119,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -1,43 +0,0 @@
-ARG ORG=dockcross
-FROM ${ORG}/base:latest
-
-LABEL maintainer="Gleb Popov arrowd@FreeBSD.org"
-
-# Crosstool-ng version 2025-09-07
-ENV CT_VERSION=crosstool-ng-1.28.0
-
-#include "common.crosstool"
-
-# 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 "loongarch64-unknown-linux-gnu" target.
-ENV CROSS_TRIPLE=loongarch64-unknown-linux-gnu
-
-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
-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 /usr/lib/${CROSS_TRIPLE}/
-ENV CMAKE_TOOLCHAIN_FILE=/usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
-
-ENV PKG_CONFIG_PATH=/usr/lib/loongarch64-unknown-linux-gnu/pkgconfig
-
-# Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=loongarch64
-
-#include "common.label-and-env"
@@ -1,20 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR loongarch64)
-
-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/")
-
-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot)
-
-set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-loongarch64)
@@ -1,16 +1,16 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # Crosstool-ng version 2022-05-19
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 ARG QEMU_VERSION=6.0.0

 #include "common.crosstool"

-ENV CROSS_TRIPLE=m68k-unknown-uclinux-uclibc
+ENV CROSS_TRIPLE m68k-unknown-uclinux-uclibc

 WORKDIR /usr/src

@@ -22,7 +22,7 @@ RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
  make install && \
  cd .. && rm -rf qemu-${QEMU_VERSION}

-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -31,19 +31,19 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
+ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"

 WORKDIR /work

 COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
-ENV CMAKE_TOOLCHAIN_FILE=/usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
+ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/mk68-unknown-linux-uclibc/pkgconfig
+ENV PKG_CONFIG_PATH /usr/lib/mk68-unknown-linux-uclibc/pkgconfig

 # Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=powerpc
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH powerpc

 #include "common.label-and-env"
@@ -11,10 +11,10 @@ set(CMAKE_Fortran_COMPILER $ENV{FC})

 set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
 set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot)


@@ -120,7 +120,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -1,12 +1,12 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest

-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

 # This is for 32-bit Big-Endian MIPS devices with hard floating point enabled

 # Crosstool-ng version 2022-05-19
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 #include "common.crosstool"

@@ -18,9 +18,9 @@ RUN apt-get update \
 && apt-get clean --yes

 # The CROSS_TRIPLE is a configured alias of the "mips-unknown-linux-gnu" target.
-ENV CROSS_TRIPLE=mips-unknown-linux-gnu
+ENV CROSS_TRIPLE mips-unknown-linux-gnu

-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -29,15 +29,15 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 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=mips
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH mips

 #include "common.label-and-env"
@@ -9,10 +9,10 @@ set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
 set(CMAKE_Fortran_COMPILER $ENV{FC})

-list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} ${cross_root} ${cross_root}/${cross_triple})
+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 ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+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-mips)
@@ -120,7 +120,7 @@ CT_LOG_EXTRA=y
 # CT_LOG_DEBUG is not set
 CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=n
+CT_LOG_PROGRESS_BAR=y
 CT_LOG_TO_FILE=y
 CT_LOG_FILE_COMPRESS=y
 # end of Paths and misc options
@@ -5,7 +5,7 @@ LABEL maintainer="Rene Helmke rene.helmke@fkie.fraunhofer.de"
 # This is for 32-bit Big-Endian MIPS devices with hard floating point enabled and uclibc.

 # Crosstool-ng version 2022-05-19
-ENV CT_VERSION=crosstool-ng-1.25.0
+ENV CT_VERSION crosstool-ng-1.25.0

 #include "common.crosstool"

@@ -17,9 +17,9 @@ RUN apt-get update \
 && apt-get clean --yes

 # The CROSS_TRIPLE is a configured alias of the "mips-unknown-linux-uclibc" target.
-ENV CROSS_TRIPLE=mips-unknown-linux-uclibc
+ENV CROSS_TRIPLE mips-unknown-linux-uclibc

-ENV CROSS_ROOT=${XCC_PREFIX}/${CROSS_TRIPLE}
+ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
@@ -28,17 +28,17 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    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}"
+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 CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake

-ENV PKG_CONFIG_PATH=/usr/lib/mips-linux-uclibc/
+ENV PKG_CONFIG_PATH /usr/lib/mips-linux-uclibc/

 # Linux kernel cross compilation variables
-ENV PATH=${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
-ENV ARCH=mips
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH mips

 #include "common.label-and-env"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bensuperpc	8ccc22fb24	Change binutils version and update config Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2024-08-04 18:31:21 +02:00
Bensuperpc	fc52124cd0	Fix wrong config Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2024-08-03 23:45:18 +02:00
Bensuperpc	33e0e3258c	Add cortex-a53 to CT_ARCH_CPU Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2024-08-03 21:20:01 +02:00
Bensuperpc	0e07884fa5	Fix duplicate variable Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2024-08-03 19:57:10 +02:00
Bensuperpc	9e891aeef3	Replace . with _ for llama variables names Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2024-08-03 19:54:05 +02:00
Bensuperpc	57dfad90f8	Add llama.cpp on CI Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2024-08-03 19:40:36 +02:00
Bensuperpc	63b11aa33d	Update main.yml Disable for now C-Plus-Plus for linux-arm64	2024-07-31 22:22:51 +02:00
Bensuperpc	5c4706c741	Merge branch 'dockcross:master' into crosstool-ng_1.26	2024-07-31 22:21:09 +02:00
Bensuperpc	9c78102a1b	Fix: enable build id and fortran on linux-arm64 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2024-05-04 20:14:36 +02:00
Bensuperpc	1b8f16f057	Update linux/arm64 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2024-05-04 19:39:31 +02:00