Update to bullseye

Update to bullseye

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

.github/workflows/main.yml

@@ -32,7 +32,7 @@ jobs:
         if: github.ref == 'refs/heads/master'
         run: |
             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
-            docker image push dockcross/base
+            docker image push dockcross/base --all-tags
 
   image:
     name: ${{ matrix.arch_name }}
@@ -41,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-s390x, linux-x64, linux-x86, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86]
+        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-mips, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2
@@ -58,4 +58,4 @@ jobs:
         if: github.ref == 'refs/heads/master'
         run: |
             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
-            docker image push dockcross/${{ matrix.arch_name }}
+            docker image push dockcross/${{ matrix.arch_name }} --all-tags

Dockerfile.in

@@ -1,4 +1,6 @@
-FROM debian:stretch-20190326-slim
+ARG DOCKER_IMAGE=debian:bullseye-slim
+FROM $DOCKER_IMAGE
+
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 #include "common.debian"

Makefile

@@ -13,10 +13,11 @@ ORG = dockcross
 BIN = ./bin
 
 # These images are built using the "build implicit rule"
-STANDARD_IMAGES = linux-s390x android-arm android-arm64 android-x86 android-x86_64 linux-x86 linux-x64 linux-arm64 linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-mipsel linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix
+STANDARD_IMAGES = linux-s390x android-arm android-arm64 android-x86 android-x86_64 linux-x86 linux-x64 linux-arm64 linux-x64-clang linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix
 
 # Generated Dockerfiles.
-GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-mipsel manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv7l-musl linux-armv6 linux-armv6-musl linux-armv5 linux-armv5-musl linux-ppc64le
+GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-x64-clang manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv7l-musl linux-armv6 linux-armv6-musl linux-armv5 linux-armv5-musl linux-ppc64le
+
 GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
 
 # These images are expected to have explicit rules for *both* build and testing
@@ -79,18 +80,12 @@ web-wasm: web-wasm/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	cp -r test web-wasm/
 	$(DOCKER) build -t $(ORG)/web-wasm:latest \
+		-t $(ORG)/web-wasm:$(TAG) \
 		--build-arg IMAGE=$(ORG)/web-wasm \
 		--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-wasm
-	$(DOCKER) build -t $(ORG)/web-wasm:$(TAG) \
-		--build-arg IMAGE=$(ORG)/web-wasm \
-		--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"` \
-		web-wasm
 	rm -rf web-wasm/test
 	rm -rf $@/imagefiles
 
@@ -106,18 +101,12 @@ web-wasm.test: web-wasm
 manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:latest \
+		-t $(ORG)/manylinux2014-aarch64:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2014-aarch64 \
 		--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 manylinux2014-aarch64/Dockerfile .
-	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:$(TAG) \
-		--build-arg IMAGE=$(ORG)/manylinux2014-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 manylinux2014-aarch64/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux2014-aarch64.test: manylinux2014-aarch64
@@ -130,18 +119,12 @@ manylinux2014-aarch64.test: manylinux2014-aarch64
 manylinux2014-x64: manylinux2014-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2014-x64:latest \
+		-t $(ORG)/manylinux2014-x64:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2014-x64 \
 		--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 manylinux2014-x64/Dockerfile .
-	$(DOCKER) build -t $(ORG)/manylinux2014-x64:$(TAG) \
-		--build-arg IMAGE=$(ORG)/manylinux2014-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 manylinux2014-x64/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux2014-x64.test: manylinux2014-x64
@@ -154,18 +137,12 @@ manylinux2014-x64.test: manylinux2014-x64
 manylinux2014-x86: manylinux2014-x86/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2014-x86:latest \
+		-t $(ORG)/manylinux2014-x86:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2014-x86 \
 		--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 manylinux2014-x86/Dockerfile .
-	$(DOCKER) build -t $(ORG)/manylinux2014-x86:$(TAG) \
-		--build-arg IMAGE=$(ORG)/manylinux2014-x86 \
-		--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 manylinux2014-x86/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux2014-x86.test: manylinux2014-x86
@@ -179,18 +156,12 @@ manylinux2014-x86.test: manylinux2014-x86
 manylinux2010-x64: manylinux2010-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2010-x64:latest \
+		-t $(ORG)/manylinux2010-x64:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2010-x64 \
 		--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 manylinux2010-x64/Dockerfile .
-	$(DOCKER) build -t $(ORG)/manylinux2010-x64:$(TAG) \
-		--build-arg IMAGE=$(ORG)/manylinux2010-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 manylinux2010-x64/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux2010-x64.test: manylinux2010-x64
@@ -204,18 +175,12 @@ manylinux2010-x64.test: manylinux2010-x64
 manylinux2010-x86: manylinux2010-x86/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2010-x86:latest \
+		-t $(ORG)/manylinux2010-x86:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2010-x86 \
 		--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 manylinux2010-x86/Dockerfile .
-	$(DOCKER) build -t $(ORG)/manylinux2010-x86:$(TAG) \
-		--build-arg IMAGE=$(ORG)/manylinux2010-x86 \
-		--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 manylinux2010-x86/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux2010-x86.test: manylinux2010-x86
@@ -229,18 +194,12 @@ manylinux2010-x86.test: manylinux2010-x86
 manylinux1-x64: manylinux1-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux1-x64:latest \
+		-t $(ORG)/manylinux1-x64:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux1-x64 \
 		--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 manylinux1-x64/Dockerfile .
-	$(DOCKER) build -t $(ORG)/manylinux1-x64:$(TAG) \
-		--build-arg IMAGE=$(ORG)/manylinux1-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 manylinux1-x64/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux1-x64.test: manylinux1-x64
@@ -254,18 +213,12 @@ manylinux1-x64.test: manylinux1-x64
 manylinux1-x86: manylinux1-x86/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux1-x86:latest \
+		-t $(ORG)/manylinux1-x86:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux1-x86 \
 		--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 manylinux1-x86/Dockerfile .
-	$(DOCKER) build -t $(ORG)/manylinux1-x86:$(TAG) \
-		--build-arg IMAGE=$(ORG)/manylinux1-x86 \
-		--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 manylinux1-x86/Dockerfile .
 	rm -rf $@/imagefiles
 
 manylinux1-x86.test: manylinux1-x86
@@ -278,14 +231,10 @@ manylinux1-x86.test: manylinux1-x86
 
 base: Dockerfile imagefiles/
 	$(DOCKER) build -t $(ORG)/base:latest \
+		-t $(ORG)/base:$(TAG) \
 		--build-arg IMAGE=$(ORG)/base \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		.
-	$(DOCKER) build -t $(ORG)/base:$(TAG) \
-		--build-arg IMAGE=$(ORG)/base \
-		--build-arg VERSION=$(TAG) \
-		--build-arg VCS_URL=`git config --get remote.origin.url` \
-		.
 
 base.test: base
 	$(DOCKER) run $(RM) $(ORG)/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base
@@ -305,18 +254,12 @@ $(VERBOSE).SILENT: display_images
 $(STANDARD_IMAGES): %: %/Dockerfile base
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/$@:latest \
+		-t $(ORG)/$@:$(TAG) \
 		--build-arg IMAGE=$(ORG)/$@ \
 		--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"` \
 		$@
-	$(DOCKER) build -t $(ORG)/$@:$(TAG) \
-		--build-arg IMAGE=$(ORG)/$@ \
-		--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:
@@ -324,13 +267,19 @@ clean:
 	for d in $(GEN_IMAGE_DOCKERFILES) ; do rm -f $$d/Dockerfile ; done
 	rm -f Dockerfile
 
+purge: clean
+# Remove all untagged images
+	$(DOCKER) container ls -aq | xargs --no-run-if-empty $(DOCKER) container rm -f
+# Remove all images with organization (ex dockcross/*)
+	$(DOCKER) images --filter=reference='$(ORG)/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f
+
 #
 # testing implicit rule
 #
 .SECONDEXPANSION:
 $(addsuffix .test,$(STANDARD_IMAGES)): $$(basename $$@)
 	$(DOCKER) run $(RM) $(ORG)/$(basename $@) > $(BIN)/dockcross-$(basename $@) && chmod +x $(BIN)/dockcross-$(basename $@)
-	$(BIN)/dockcross-$(basename $@) python test/run.py $($@_ARGS)
+	$(BIN)/dockcross-$(basename $@) python3 test/run.py $($@_ARGS)
 
 #
 # testing prerequisites implicit rule
@@ -340,4 +289,4 @@ test.prerequisites:
 
 $(addsuffix .test,base $(IMAGES)): test.prerequisites
 
-.PHONY: base images $(IMAGES) test %.test clean
+.PHONY: base images $(IMAGES) test %.test clean purge

README.rst

@@ -187,13 +187,6 @@ dockcross/linux-armv7l-musl
   |linux-armv7l-musl-images| Toolchain configured for ARMv7-L, using `musl <https://www.musl-libc.org/>`_ as base "libc".
 
 
-.. |linux-mipsel-images| image:: https://images.microbadger.com/badges/image/dockcross/linux-mipsel.svg
-  :target: https://microbadger.com/images/dockcross/linux-mipsel
-
-dockcross/linux-mipsel
-  |linux-mipsel-images| Linux mipsel cross compiler toolchain for little endian MIPS GNU systems.
-
-
 .. |linux-mips-images| image:: https://images.microbadger.com/badges/image/dockcross/linux-mips.svg
   :target: https://microbadger.com/images/dockcross/linux-mips
 
@@ -223,6 +216,12 @@ dockcross/linux-x64
   |linux-x64-images| Linux x86_64 / amd64 compiler. Since the Docker image is
   natively x86_64, this is not actually a cross compiler.
 
+.. |linux-x64-clang-images| image:: https://images.microbadger.com/badges/image/dockcross/linux-x64-clang.svg
+  :target: https://microbadger.com/images/dockcross/linux-x64-clang
+
+dockcross/linux-x64-clang
+  |linux-x64-clang-images| Linux clang x86_64 / amd64 compiler. Since the Docker image is
+  natively x86_64, this is not actually a cross compiler.
 
 .. |linux-x86-images| image:: https://images.microbadger.com/badges/image/dockcross/linux-x86.svg
   :target: https://microbadger.com/images/dockcross/linux-x86

common-manylinux.crosstool

@@ -48,6 +48,7 @@ ENV XCC_PREFIX=/usr/xcc
 COPY \
   imagefiles/install-crosstool-ng-toolchain.sh \
   imagefiles/crosstool-ng-expat.patch \
+  imagefiles/Fix-error-with-bash-5-and-up.patch \
   manylinux2014-aarch64/crosstool-ng.config \
   /dockcross/
 

common.crosstool

@@ -16,12 +16,18 @@
 
 # Install Debian packages required for `ct-ng`.
 RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
-  gawk \
-  gperf \
-  help2man \
-  python-dev \
-  texinfo \
-&& apt-get clean --yes
+    gawk \
+    gperf \
+    help2man \
+    python3-dev \
+    texinfo \
+# Packages needed for crosstool-ng 1.24 or higher 
+    unzip \
+    libtool \
+    libtool-bin \
+    && apt-get clean autoclean --yes \
+    && apt-get autoremove --yes \
+    && rm -rf /var/lib/{apt,dpkg,cache,log}/
 
 ENV XCC_PREFIX=/usr/xcc
 
@@ -33,6 +39,7 @@ ENV XCC_PREFIX=/usr/xcc
 COPY \
   imagefiles/install-crosstool-ng-toolchain.sh \
   imagefiles/crosstool-ng-expat.patch \
+  imagefiles/Fix-error-with-bash-5-and-up.patch \
   crosstool-ng.config \
   /dockcross/
 

common.debian

@@ -1,11 +1,6 @@
 ARG DEBIAN_FRONTEND=noninteractive
-ARG REPO=http://cdn-fastly.deb.debian.org
 
 RUN \
-  bash -c "echo \"deb $REPO/debian stretch main contrib non-free\" > /etc/apt/sources.list"  && \
-  bash -c "echo \"deb $REPO/debian stretch-updates main contrib non-free\" >> /etc/apt/sources.list"  && \
-  bash -c "echo \"deb $REPO/debian-security stretch/updates main\" >> /etc/apt/sources.list" && \
-  bash -c "echo \"deb http://ftp.debian.org/debian stretch-backports main\" >> /etc/apt/sources.list" && \
   apt-get update --yes && \
   apt-get install --no-install-recommends --yes \
     autogen \
@@ -30,8 +25,8 @@ RUN \
     ncurses-dev \
     pkg-config \
     pax \
-#    python3 \
-#    python3-pip \
+    python3 \
+    python3-pip \
     rsync \
     sed \
     ssh \
@@ -41,23 +36,7 @@ RUN \
     xz-utils \
     zip \
     zlib1g-dev \
-# python build
-    libncurses5-dev \
-    libgdbm-dev \
-    libnss3-dev \
-    libssl-dev \
-    libsqlite3-dev \
-    libreadline-dev \
-    libffi-dev \
-    libbz2-dev\
-  && \
-  apt-get clean --yes
-
-# build and install python
-COPY \
-  imagefiles/build-and-install-python.sh \
-  /buildscripts/
-RUN \
-  set -x && \
-  /buildscripts/build-and-install-python.sh && \
-  rm -rf /buildscripts
+    python-is-python3 \
+    && apt-get clean autoclean --yes \
+    && apt-get autoremove --yes \
+    && rm -rf /var/lib/{apt,dpkg,cache,log}/

common.docker

@@ -25,7 +25,7 @@ RUN \
   /buildscripts/build-and-install-git.sh && \
   /buildscripts/install-cmake-binary.sh $X86_FLAG && \
   /buildscripts/install-liquidprompt-binary.sh && \
-  PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python") && \
+  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} && \
   rm -rf /buildscripts

imagefiles/Fix-error-with-bash-5-and-up.patch

@@ -0,0 +1,28 @@
+From 67368ebe9d9259e9f34a4f9166a33357858813f1 Mon Sep 17 00:00:00 2001
+From: Bensuperpc <bensuperpc@gmail.com>
+Date: Thu, 24 Jun 2021 11:55:48 +0200
+Subject: [PATCH 1/1] Fix error with bash 5 and up
+
+Fix error with bash 5 and up
+
+Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d10bf71d..e2302b4c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -274,7 +274,7 @@ ACX_PROG_VERSION_REQ_STRICT([BASH_SHELL],
+     [GNU bash >= 3.1],
+     [bash],
+     [bash],
+-    ['^GNU bash, version (3\.[1-9]|4)'])
++    ['^GNU bash, version (3\.[1-9]|4|5)'])
+ 
+ # We need a awk that *is* GNU awk
+ ACX_PROG_VERSION_REQ_STRICT([AWK],
+-- 
+2.32.0
+

imagefiles/build-and-install-python.sh

@@ -6,6 +6,8 @@
 # Usage:
 #
 #  build-and-install-python.sh [-version 3.9.5]
+# needed packages : libncurses5-dev libgdbm-dev libnss3-dev 
+#   libssl-dev libsqlite3-dev libreadline-dev libffi-dev libbz2-dev
 
 PYTHON_VERSION=3.9.5
 while [ $# -gt 0 ]; do

imagefiles/install-crosstool-ng-toolchain.sh

@@ -77,6 +77,8 @@ git checkout ${REV}
 
 if [ ${REV} = "crosstool-ng-1.23.0" ]; then
   patch scripts/build/companion_libs/210-expat.sh -i /dockcross/crosstool-ng-expat.patch
+  # Patch to fix error with bash 5 and up: https://github.com/pfalcon/esp-open-sdk/issues/365
+  patch configure.ac -i /dockcross/Fix-error-with-bash-5-and-up.patch
 fi
 
 # Bootstrap and install the tool.
@@ -109,8 +111,11 @@ cp "${CONFIG_PATH}" "${BUILD}/.config"
 
 # As mentioned in ct-ng config, need to unset LD_LIBRARY_PATH.
 unset LD_LIBRARY_PATH
+# Fix build error on manylinux2014-aarch64
+unset CC
+unset CXX
 
 # Build and install the toolchain!
 # Print last 250 lines if build fail
-"${BOOTSTRAP_PREFIX}/bin/ct-ng" build || tail -250 build.log
+"${BOOTSTRAP_PREFIX}/bin/ct-ng" build || (tail -250 build.log && exit 1)
 

linux-arm64/Dockerfile.in

@@ -3,7 +3,8 @@ FROM dockcross/base:latest
 # This is for 64-bit ARM Linux machine
 
 # Crosstool-ng version
-ENV CT_VERSION crosstool-ng-1.23.0
+# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
+ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
 
 #include "common.crosstool"
 

linux-armv5-musl/Dockerfile.in

@@ -5,6 +5,9 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # VFP instructions (armhf).
 # musleabi as default glibc
 
+# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
+ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
+
 #include "common.crosstool"
 
 # The cross-compiling emulator

linux-armv5/Dockerfile.in

@@ -5,7 +5,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # VFP instructions (armhf).
 
 # Crosstool-ng version
-ENV CT_VERSION crosstool-ng-1.23.0
+# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
+ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
 
 #include "common.crosstool"
 

linux-armv7/Dockerfile.in

@@ -2,7 +2,8 @@ FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
-ENV CT_VERSION crosstool-ng-1.23.0
+# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
+ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
 
 # This is for 32-bit ARMv7 Linux
 #include "common.crosstool"

linux-armv7a/Dockerfile.in

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

linux-mips/Dockerfile.in

@@ -3,7 +3,8 @@ FROM dockcross/base:latest
 # This is for 32-bit Big-Endian MIPS devices with hard floating point enabled
 
 # Crosstool-ng version
-ENV CT_VERSION crosstool-ng-1.23.0
+# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
+ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
 
 #include "common.crosstool"
 

linux-mipsel/Dockerfile.in

@@ -1,40 +0,0 @@
-FROM dockcross/base:latest
-MAINTAINER Sergi Alvarez "pancake@nopcode.org"
-
-# This is for ARMv5 "legacy" (mipsel) devices which do NOT support hard float
-# VFP instructions (mipshf).
-
-# From https://wiki.debian.org/CrossToolchains, installing for jessie
-RUN echo "deb http://emdebian.org/tools/debian/ jessie main" > /etc/apt/sources.list.d/emdebian.list \
-&& curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add - \
-&& sed -i 's/httpredir.debian.org/http.debian.net/' /etc/apt/sources.list \
-&& dpkg --add-architecture mipsel \
-&& apt-get update && apt-get install -y crossbuild-essential-mipsel
-
-# The cross-compiling emulator
-RUN apt-get update && apt-get install -y \
-  qemu-user \
-  qemu-user-static
-
-ENV CROSS_TRIPLE mipsel-linux-gnu
-ENV CROSS_ROOT /usr/bin
-ENV AS=${CROSS_ROOT}/${CROSS_TRIPLE}-as \
-    AR=${CROSS_ROOT}/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/${CROSS_TRIPLE}-gcc \
-    CPP=${CROSS_ROOT}/${CROSS_TRIPLE}-cpp-4.9 \
-    CXX=${CROSS_ROOT}/${CROSS_TRIPLE}-g++ \
-    LD=${CROSS_ROOT}/${CROSS_TRIPLE}-ld \
-    FC=${CROSS_ROOT}/${CROSS_TRIPLE}-gfortran
-
-ENV QEMU_LD_PREFIX ${CROSS_ROOT}/libc
-ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${CROSS_ROOT}/libc/lib/${CROSS_TRIPLE}/"
-
-COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
-
-# Linux kernel cross compilation variables
-ENV PATH ${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE ${CROSS_TRIPLE}-
-ENV ARCH mips
-
-#include "common.label-and-env"

linux-mipsel/Toolchain.cmake

@@ -1,16 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR mipsel)
-
-set(cross_triple "mipsel-linux-gnu")
-
-set(CMAKE_C_COMPILER $ENV{CC})
-set(CMAKE_CXX_COMPILER $ENV{CXX})
-set(CMAKE_Fortran_COMPILER $ENV{FC})
-
-set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT} $ENV{CROSS_ROOT}/libc/usr)
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
-
-set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-mipsel)

linux-ppc64le/Dockerfile.in

@@ -2,21 +2,24 @@ FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
-ENV CT_VERSION crosstool-ng-1.23.0
+# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
+ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
+
+ENV QEMU_VERSION 6.0.0
 
 #include "common.crosstool"
 
-ENV CROSS_TRIPLE powerpc64le-linux-gnu
+ENV CROSS_TRIPLE powerpc64le-unknown-linux-gnu
 
 WORKDIR /usr/src
 
 RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
-  curl -L http://wiki.qemu-project.org/download/qemu-3.1.0.tar.bz2 | tar xj && \
-  cd qemu-3.1.0 && \
+  curl -L http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \
+  cd qemu-${QEMU_VERSION} && \
   ./configure --target-list=ppc64le-linux-user --prefix=/usr && \
   make -j$(nproc) && \
   make install && \
-  cd .. && rm -rf qemu-3.1.0
+  cd .. && rm -rf qemu-${QEMU_VERSION}
 
 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
@@ -35,7 +38,7 @@ WORKDIR /work
 COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
 ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
 
-ENV PKG_CONFIG_PATH /usr/lib/powerpc64le-linux-gnu/pkgconfig
+ENV PKG_CONFIG_PATH /usr/lib/powerpc64le-unknown-linux-gnu/pkgconfig
 
 # Linux kernel cross compilation variables
 ENV PATH ${PATH}:${CROSS_ROOT}/bin

linux-ppc64le/Toolchain.cmake

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

linux-ppc64le/sources.list

@@ -1,10 +0,0 @@
-#------------------------------------------------------------------------------#
-#                   OFFICIAL DEBIAN REPOS
-#------------------------------------------------------------------------------#
-
-###### Debian Main Repos
-deb http://deb.debian.org/debian/ oldstable main contrib non-free
-
-deb http://deb.debian.org/debian/ oldstable-updates main contrib non-free
-
-deb http://deb.debian.org/debian-security oldstable/updates main

linux-s390x/crosstool-ng.config

@@ -343,7 +343,7 @@ CT_CC_CORE_PASSES_NEEDED=y
 CT_CC_CORE_PASS_1_NEEDED=y
 CT_CC_CORE_PASS_2_NEEDED=y
 CT_CC_gcc=y
-CT_CC_GCC_VERSION="6.3.0"
+CT_CC_GCC_VERSION="7.3.0"
 # CT_CC_GCC_SHOW_LINARO is not set
 CT_CC_GCC_V_6_3_0=y
 # CT_CC_GCC_V_5_4_0 is not set

linux-x64-clang/Dockerfile.in

@@ -0,0 +1,35 @@
+FROM dockcross/base:latest
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+ # flang
+RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \
+    && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \
+    && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
+    && apt-get update \
+    && apt-get purge --autoremove -y gcc g++ software-properties-common \
+    && apt-get -y install clang libc++-dev libc++abi-dev clang-format clang-tidy lldb \
+    && apt-get clean --yes \
+    && rm -rf /var/lib/apt/lists/* \
+    && update-alternatives --install /usr/bin/cc cc /usr/bin/clang 90 \
+    && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 90 \
+    && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++ 90 \
+    && cc --version \
+    && c++ --version \
+    && cpp --version
+
+ENV CROSS_TRIPLE x86_64-linux-gnu
+ENV CROSS_ROOT /usr/bin
+ENV CC=/usr/bin/clang \
+    CPP=/usr/bin/cpp \
+    CXX=/usr/bin/clang++ \
+    LD=/usr/bin/lld \
+    FC=/usr/bin/flang
+
+#    AS=/usr/bin/${CROSS_TRIPLE}-as
+#    AR=/usr/bin/${CROSS_TRIPLE}-ar
+
+COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
+
+COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
+ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
+
+#include "common.label-and-env"

linux-x64-clang/Toolchain.cmake

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

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

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

manylinux2014-aarch64/Dockerfile.in

@@ -6,6 +6,10 @@ FROM dockcross/manylinux2014-x64
 
 # This is for 64-bit ARM Manylinux machine
 
+# Crosstool-ng version
+# Issues with crosstool-ng-1.24.0 and up : https://github.com/dockcross/dockcross/issues/367
+ENV CT_VERSION crosstool-ng-1.23.0
+
 #include "common-manylinux.crosstool"
 
 # The cross-compiling emulator

web-wasm/Dockerfile.in

@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.22
+FROM emscripten/emsdk:2.0.24
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Revert back to "/bin/sh" as default shell