Change binutils version and update config

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

.github/workflows/main.yml

@@ -9,13 +9,10 @@ on:
       - "*"
   workflow_dispatch:
 
-env:
-  OCI_EXE: docker
-
 jobs:
   base:
     name: base
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: checkout code
         uses: actions/checkout@v4
@@ -23,7 +20,15 @@ jobs:
           submodules: "recursive"
           fetch-depth: 1
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: build
+        env:
+          BUILD_CMD: buildx build --platform linux/amd64,linux/arm64
         run: make base
 
       - name: test
@@ -41,83 +46,25 @@ jobs:
           path: ./cache
           retention-days: 3
 
-      - name: Login to Docker Hub
-        if: github.ref == 'refs/heads/master'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
-
       - name: deploy
         if: github.ref == 'refs/heads/master'
         run: |
+            docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
             docker image push dockcross/base --all-tags
 
-  base-multiarch:
+  image:
-    name: base-multiarch
+    name: ${{ matrix.arch_name.image }}
-    runs-on: ${{ matrix.os }}
+    needs: base
-    strategy:
+    runs-on: ubuntu-latest
-      max-parallel: 5
-      matrix:
-        os: [ubuntu-22.04, ubuntu-22.04-arm]
-    steps:
-      - name: checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: "recursive"
-          fetch-depth: 1
-
-      - name: set host_arch
-        run: |
-          echo "HOST_ARCH=$(uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')" >> $GITHUB_ENV
-
-      - name: build multiarch
-        run: |
-          make base-${{ env.HOST_ARCH }}
-
-      - name: test multiarch
-        run: |
-          mkdir -p bin
-          make base-${{ env.HOST_ARCH }}.test
-
-      - name: archive base
-        run: |
-          mkdir -p cache
-          docker export dockcross/base:latest-${{ env.HOST_ARCH }} | xz -e9 -T0 > ./cache/base-multiarch.tar.xz
-
-      - name: save base
-        uses: actions/upload-artifact@v4
-        with:
-          name: cache-${{ matrix.os }}
-          path: ./cache
-          retention-days: 3
-
-      - name: Login to Docker Hub
-        if: github.ref == 'refs/heads/master'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
-
-      - name: deploy
-        if: github.ref == 'refs/heads/master'
-        run: |
-            docker image push dockcross/base --all-tags
-
-  images:
-    needs: [base, base-multiarch]
-    runs-on: ${{ matrix.os }}
     env:
       OCI_EXE: docker
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-22.04-arm]
         arch_name:
           # Android images
           - {
               image: "android-arm",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv7 COMP=ndk",
               ninja: "no",
@@ -139,7 +86,6 @@ jobs:
             }
           - {
               image: "android-arm64",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv8 COMP=ndk",
               ninja: "no",
@@ -161,7 +107,6 @@ jobs:
             }
           - {
               image: "android-x86",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-32 COMP=ndk",
               ninja: "no",
@@ -183,7 +128,6 @@ jobs:
             }
           - {
               image: "android-x86_64",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64 COMP=ndk",
               ninja: "no",
@@ -203,15 +147,14 @@ jobs:
               cpython: "no",
               cpython_arg: "--host=x86_64-linux-android --target=x86_64-linux-android",
             }
-          # inux arm64/armv8 images
+          # Linux arm64/armv8 images
           - {
               image: "linux-arm64",
-              multiarch: "yes",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv8",
               ninja: "yes",
               ninja_arg: "",
-              openssl: "no",
+              openssl: "yes",
               openssl_arg: "linux-aarch64",
               C: "yes",
               C_arg: "",
@@ -228,7 +171,6 @@ jobs:
             }
           - {
               image: "linux-arm64-lts",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv8",
               ninja: "yes",
@@ -250,7 +192,6 @@ jobs:
             }
           - {
               image: "linux-arm64-musl",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv8",
               ninja: "yes",
@@ -272,7 +213,6 @@ jobs:
             }
           - {
               image: "linux-arm64-full",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv8",
               ninja: "yes",
@@ -295,7 +235,6 @@ jobs:
           # Linux mipel images
           - {
               image: "linux-mipsel-lts",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "no",
@@ -318,7 +257,6 @@ jobs:
           # Linux armv5 images
           - {
               image: "linux-armv5",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -340,7 +278,6 @@ jobs:
             }
           - {
               image: "linux-armv5-musl",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -362,7 +299,6 @@ jobs:
             }
           - {
               image: "linux-armv5-uclibc",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -385,7 +321,6 @@ jobs:
           # Linux armv6 images
           - {
               image: "linux-armv6",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -407,7 +342,6 @@ jobs:
             }
           - {
               image: "linux-armv6-lts",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -429,7 +363,6 @@ jobs:
             }
           - {
               image: "linux-armv6-musl",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -452,7 +385,6 @@ jobs:
           # Linux armv7 images
           - {
               image: "linux-armv7",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv7",
               ninja: "yes",
@@ -474,7 +406,6 @@ jobs:
             }
           - {
               image: "linux-armv7a",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv7-neon",
               ninja: "yes",
@@ -496,7 +427,6 @@ jobs:
             }
           - {
               image: "linux-armv7a-lts",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv7-neon",
               ninja: "yes",
@@ -518,7 +448,6 @@ jobs:
             }
           - {
               image: "linux-armv7-lts",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv7",
               ninja: "yes",
@@ -540,7 +469,6 @@ jobs:
             }
           - {
               image: "linux-armv7l-musl",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=armv7",
               ninja: "yes",
@@ -563,7 +491,6 @@ jobs:
           # Linux x86 images
           - {
               image: "linux-x86",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-32-sse41-popcnt",
               ninja: "yes",
@@ -586,7 +513,6 @@ jobs:
           # Linux i686 images
           - {
               image: "linux-i686",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -609,7 +535,6 @@ jobs:
           # Linux x86_64 images
           - {
               image: "linux-x64",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern",
               ninja: "yes",
@@ -631,7 +556,6 @@ jobs:
             }
           - {
               image: "linux-x64-tinycc",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern",
               ninja: "yes",
@@ -653,7 +577,6 @@ jobs:
             }
           - {
               image: "linux-x64-clang",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern COMP=clang",
               ninja: "yes",
@@ -675,7 +598,6 @@ jobs:
             }
           - {
               image: "linux-x86_64-full",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern",
               ninja: "yes",
@@ -698,7 +620,6 @@ jobs:
           # Linux riscv images
           - {
               image: "linux-riscv32",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -720,7 +641,6 @@ jobs:
             }
           - {
               image: "linux-riscv64",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -743,7 +663,6 @@ jobs:
           # Linux s390x images
           - {
               image: "linux-s390x",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -766,7 +685,6 @@ jobs:
           # Linux mips images 
           - {
               image: "linux-mips",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -788,7 +706,6 @@ jobs:
             }
           - {
               image: "linux-mips-uclibc",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -811,7 +728,6 @@ jobs:
           # Linux mips images
           - {
               image: "linux-mips-lts",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -831,32 +747,9 @@ jobs:
               cpython: "yes",
               cpython_arg: "--host=mips-unknown-linux-gnu --target=mips-unknown-linux-gnu",
             }
-            # Linux ppc images
-          - {
-              image: "linux-ppc",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-ppc",
-              C: "yes",
-              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
-              llama_cpp: "yes",
-              llama_cpp_arg: "",
-              fmt: "yes",
-              fmt_arg: "",
-              raylib: "no",
-              raylib_arg: "",
-              cpython: "yes",
-              cpython_arg: "--host=powerpc-unknown-linux-gnu --target=powerpc-unknown-linux-gnu",
-            }
           # Linux ppc64le images
           - {
               image: "linux-ppc64le",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=ppc-64",
               ninja: "yes",
@@ -865,9 +758,9 @@ jobs:
               openssl_arg: "linux-ppc64le",
               C: "yes",
               C_arg: "",
-              C-Plus-Plus: "no",
+              C-Plus-Plus: "yes",
               C-Plus-Plus_arg: "",
-              llama_cpp: "yes",
+              llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
               fmt_arg: "",
@@ -879,7 +772,6 @@ jobs:
           # Linux ppc64le-lts images
           - {
               image: "linux-ppc64le-lts",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=ppc-64",
               ninja: "yes",
@@ -902,7 +794,6 @@ jobs:
           # Linux m68k images
           - {
               image: "linux-m68k-uclibc",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "no",
@@ -925,7 +816,6 @@ jobs:
           # Linux xtensa images
           - {
               image: "linux-xtensa-uclibc",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "yes",
@@ -948,7 +838,6 @@ jobs:
           # Windows x86_x64 images
           - {
               image: "windows-static-x64",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern COMP=mingw",
               ninja: "no",
@@ -970,7 +859,6 @@ jobs:
             }
           - {
               image: "windows-static-x64-posix",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern COMP=mingw",
               ninja: "no",
@@ -992,7 +880,6 @@ jobs:
             }
           - {
               image: "windows-shared-x64",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "no",
@@ -1014,7 +901,6 @@ jobs:
             }
           - {
               image: "windows-shared-x64-posix",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "no",
@@ -1037,7 +923,6 @@ jobs:
           # Windows x86 images
           - {
               image: "windows-static-x86",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-32-sse41-popcnt COMP=mingw",
               ninja: "no",
@@ -1059,7 +944,6 @@ jobs:
             }
           - {
               image: "windows-shared-x86",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "no",
@@ -1082,7 +966,6 @@ jobs:
           # Windows arm images
           - {
               image: "windows-armv7",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "ARCH=armv7-neon COMP=clang",
               ninja: "yes",
@@ -1104,7 +987,6 @@ jobs:
             }
           - {
               image: "windows-arm64",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "ARCH=armv8 COMP=clang",
               ninja: "yes",
@@ -1127,7 +1009,6 @@ jobs:
           # manylinux_2_28 images
           - {
               image: "manylinux_2_28-x64",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern",
               ninja: "yes",
@@ -1150,7 +1031,6 @@ jobs:
           # manylinux2014 images
           - {
               image: "manylinux2014-x86",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-32-sse41-popcnt",
               ninja: "yes",
@@ -1172,7 +1052,6 @@ jobs:
             }
           - {
               image: "manylinux2014-x64",
-              multiarch: "",
               stockfish: "yes",
               stockfish_arg: "ARCH=x86-64-modern",
               ninja: "yes",
@@ -1194,7 +1073,6 @@ jobs:
             }
           - {
               image: "manylinux2014-aarch64",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "no",
@@ -1217,7 +1095,6 @@ jobs:
           # web-wasm images
           - {
               image: "web-wasm",
-              multiarch: "yes",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "no",
@@ -1239,7 +1116,6 @@ jobs:
             }
           - {
               image: "web-wasi",
-              multiarch: "yes",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "no",
@@ -1261,7 +1137,6 @@ jobs:
             }
           - {
               image: "web-wasi-threads",
-              multiarch: "yes",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "no",
@@ -1284,7 +1159,6 @@ jobs:
           # Bare metal images
           - {
               image: "bare-armv7emhf-nano_newlib",
-              multiarch: "",
               stockfish: "no",
               stockfish_arg: "",
               ninja: "no",
@@ -1315,13 +1189,6 @@ jobs:
           submodules: "recursive"
           fetch-depth: 1
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: set host_arch
-        run: |
-          echo "HOST_ARCH=$(uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')" >> $GITHUB_ENV
-
       - uses: actions/download-artifact@v4
         with:
           name: cache
@@ -1330,44 +1197,28 @@ jobs:
       - name: load base
         run: xz -d -k < ./cache/base.tar.xz | docker import - dockcross/base:latest
 
-      - uses: actions/download-artifact@v4
-        with:
-          name: cache-${{ matrix.os }}
-          path: ./cache
-
-      - name: load multiarch base
-        run: xz -d -k < ./cache/base-multiarch.tar.xz | docker import - dockcross/base:latest-${{ env.HOST_ARCH }}
-
       - name: build
         env:
           BUILD_CMD: build --cache-from type=gha --cache-to type=gha,mode=max
-        run: |
+        run: make ${{ matrix.arch_name.image }}
-          if test "${{ matrix.arch_name.multiarch }}" = "yes"; then
-            make ${{ matrix.arch_name.image }}
-          elif test "${{ env.HOST_ARCH }}" = "amd64"; then
-            make ${{ matrix.arch_name.image }}
-          fi
 
       - name: basic test
-        run: |
+        run: make ${{ matrix.arch_name.image }}.test
-          if test "${{ matrix.arch_name.multiarch }}" = "yes" || test "${{ env.HOST_ARCH }}" = "amd64"; then
-            make ${{ matrix.arch_name.image }}.test
-          fi
 
       # Updated on 19/05/2022
       - name: stockfish build test
-        if: ${{ matrix.arch_name.stockfish == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        if: ${{ matrix.arch_name.stockfish == 'yes' }}
         run: |
           git clone --depth 1 --branch sf_15 https://github.com/official-stockfish/Stockfish.git
           cd Stockfish/src
           ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} net
-          ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} build ${{ matrix.arch_name.stockfish_arg }} -j${nproc}
+          ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} build ${{ matrix.arch_name.stockfish_arg }} -j2
           cd ../..
           rm -rf Stockfish
 
       # Updated on 12/09/2022
       - name: ninja build test
-        if: ${{ matrix.arch_name.ninja == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        if: ${{ matrix.arch_name.ninja == 'yes' }}
         run: |
           git clone --depth 1 --branch v1.11.1 https://github.com/ninja-build/ninja.git
           cd ninja
@@ -1375,20 +1226,20 @@ jobs:
 
       # Updated on 12/09/2022
       - name: openssl build test
-        if: ${{ matrix.arch_name.openssl == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        if: ${{ matrix.arch_name.openssl == 'yes' }}
         run: |
           git clone --depth 1 --branch OpenSSL_1_1_1q https://github.com/openssl/openssl.git
           cd openssl
           wget https://raw.githubusercontent.com/mavlink/MAVSDK/main/third_party/openssl/dockcross-android.patch
           patch -p 0 < dockcross-android.patch
           ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./Configure ${{ matrix.arch_name.openssl_arg }}
-          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j${nproc}
+          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
           cd ..
           rm -rf openssl
 
       # Updated on 12/09/2022
       - name: C build test
-        if: ${{ matrix.arch_name.C == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        if: ${{ matrix.arch_name.C == 'yes' }}
         run: |
           git clone https://github.com/TheAlgorithms/C.git
           cd C
@@ -1399,7 +1250,7 @@ jobs:
 
       # Updated on 12/09/2022 No longer maintained
       - name: C-Plus-Plus build test
-        if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' }}
         run: |
           git clone https://github.com/TheAlgorithms/C-Plus-Plus.git
           cd C-Plus-Plus
@@ -1410,7 +1261,7 @@ jobs:
 
       # Updated on 03/08/2024
       - name: llama.cpp build test
-        if: ${{ matrix.arch_name.llama_cpp == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        if: ${{ matrix.arch_name.llama_cpp == 'yes' }}
         run: |
           git clone https://github.com/ggerganov/llama.cpp.git
           cd llama.cpp
@@ -1421,7 +1272,7 @@ jobs:
 
       # Updated on 12/09/2022
       - name: fmt build test
-        if: ${{ matrix.arch_name.fmt == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        if: ${{ matrix.arch_name.fmt == 'yes' }}
         run: |
           git clone --depth 1 --branch 9.1.0 https://github.com/fmtlib/fmt.git
           cd fmt
@@ -1431,18 +1282,18 @@ jobs:
 
       # Updated on 19/05/2022
       - name: cpython build test
-        if: ${{ matrix.arch_name.cpython == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        if: ${{ matrix.arch_name.cpython == 'yes' }}
         run: |
           git clone --depth 1 --branch v3.11.2 https://github.com/python/cpython.git
           cd cpython
           ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no --disable-ipv6 ${{ matrix.arch_name.cpython_arg }} --build=x86_64-linux-gnu --with-build-python --enable-shared
-          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j${nproc}
+          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
           cd ..
           rm -rf cpython
 
       # Updated on 12/09/2022 (4.2.0 branch not working)
       - name: raylib build test
-        if: ${{ matrix.arch_name.raylib == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        if: ${{ matrix.arch_name.raylib == 'yes' }}
         run: |
           git clone https://github.com/raysan5/raylib.git
           cd raylib
@@ -1453,7 +1304,7 @@ jobs:
 
       # Updated on 31/3/2022
       - name: mbedtls build test
-        if: ${{ matrix.arch_name.mbedtls == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        if: ${{ matrix.arch_name.mbedtls == 'yes' }}
         run: |
           git clone --depth 1 --branch archive/baremetal https://github.com/Mbed-TLS/mbedtls.git
           cd mbedtls
@@ -1464,7 +1315,7 @@ jobs:
 
       # Updated on 20/6/2022
       - name: libopencm3 build test
-        if: ${{ matrix.arch_name.libopencm3 == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        if: ${{ matrix.arch_name.libopencm3 == 'yes' }}
         run: |
           git clone https://github.com/libopencm3/libopencm3.git
           cd libopencm3
@@ -1479,79 +1330,8 @@ jobs:
           cd ..
           rm -rf libopencm3
 
-      - name: archive ${{ matrix.arch_name.image }}-${{ env.HOST_ARCH }}
+      - name: deploy
-        if: matrix.arch_name.multiarch == 'yes'
-        run: |
-          mkdir -p cache-${{ matrix.arch_name.image }}-${{ env.HOST_ARCH }}
-          docker export dockcross/${{ matrix.arch_name.image }}:latest-${{ env.HOST_ARCH }} | xz -e9 -T0 > ./cache/${{ matrix.arch_name.image }}-${{ env.HOST_ARCH }}.tar.xz
-
-      - name: save ${{ matrix.arch_name.image }}-${{ matrix.os }}
-        uses: actions/upload-artifact@v4
-        if: matrix.arch_name.multiarch == 'yes'
-        with:
-          name: cache-${{ matrix.arch_name.image }}-${{ env.HOST_ARCH }}
-          path: ./cache/${{ matrix.arch_name.image }}-${{ env.HOST_ARCH }}.tar.xz
-          retention-days: 3
-
-      - name: Login to Docker Hub
-        if: github.ref == 'refs/heads/master' && matrix.arch_name.multiarch != 'yes' && env.HOST_ARCH == 'amd64'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
-
-      - name: deploy-not-multi-arch
-        if: github.ref == 'refs/heads/master' && matrix.arch_name.multiarch != 'yes' && env.HOST_ARCH == 'amd64'
-        run: |
-            make ${{ matrix.arch_name.image }}.push
-
-  deploy-multi-arch-images:
-    needs:
-      - images
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        image_name: ["linux-arm64", "web-wasm", "web-wasi", "web-wasi-threads"]
-    steps:
-      - name: checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: "recursive"
-          fetch-depth: 1
-
-      - name: download ${{ matrix.image_name }}-amd64
-        uses: actions/download-artifact@v4
-        with:
-          name: cache-${{ matrix.image_name }}-amd64
-          path: ./cache/${{ matrix.image_name }}-amd64.tar.xz
-
-      - name: download ${{ matrix.image_name }}-arm64
-        uses: actions/download-artifact@v4
-        with:
-          name: cache-${{ matrix.image_name }}-arm64
-          path: ./cache/${{ matrix.image_name }}-arm64.tar.xz
-
-      - name: load images
-        run: |
-          xz -d -k < ./cache/${{ matrix.image_name }}-amd64.tar.xz | docker import - dockcross/${{ matrix.image_name }}-amd64
-          xz -d -k < ./cache/${{ matrix.image_name }}-arm64.tar.xz | docker import - dockcross/${{ matrix.image_name }}-arm64
-
-      - name: Login to Docker Hub
-        if: github.ref == 'refs/heads/master'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
-
-      - name: deploy-multi-arch
         if: github.ref == 'refs/heads/master'
         run: |
-
+            docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
-            make ${{ matrix.image_name }}.tag-amd64
+            docker image push dockcross/${{ matrix.arch_name.image }} --all-tags
-            make ${{ matrix.image_name }}.tag-arm64
-
-            make ${{ matrix.image_name }}.push-amd64
-            make ${{ matrix.image_name }}.push-arm64
-
-            make ${{ matrix.image_name }}.push

.gitignore

@@ -9,4 +9,3 @@ web-wasm/Dockerfile
 */imagefiles/*
 !imagefiles/*
 crosstool-ng/*
-llama.cpp/*

CONTRIBUTING.md

@@ -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:
@@ -130,7 +130,7 @@ 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
 
@@ -185,7 +185,7 @@ ENV CROSS_TRIPLE aarch64-unknown-linux-gnu
 These lines also need to be changed:
 
 ```docker
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 ENV PKG_CONFIG_PATH /usr/lib/aarch64-linux-gnu/pkgconfig
 ENV ARCH arm64
 ```

Dockerfile.in

@@ -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"
 

Makefile

@@ -3,20 +3,8 @@
 # Parameters
 #
 
-# Name of the docker-equivalent executable for building images.
+# Name of the docker executable
-# OCI: open container interface.
-# Common values: docker, podman, buildah
 DOCKER := $(or $(OCI_EXE), docker)
-BUILD_DOCKER := $(or $(BUILD_DOCKER), $(DOCKER))
-BUILDAH := $(or $(BUILDAH_EXE), buildah)
-# 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:
 #
@@ -24,24 +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 := $(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-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,24 +37,20 @@ GEN_IMAGES := android-arm android-arm64 \
 	manylinux_2_28-x64 \
 	manylinux2014-x64 manylinux2014-x86 \
 	manylinux2014-aarch64 linux-arm64-lts \
-	web-wasm web-wasi web-wasi-emulated-threads web-wasi-threads linux-mips linux-mips-uclibc linux-mips-lts windows-arm64 windows-armv7 \
+	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 manylinux2014-x64 manylinux2014-x86 \
-		      manylinux2014-aarch64 web-wasm web-wasi-emulated-threads web-wasi-threads
+		      manylinux2014-aarch64 web-wasm web-wasi-threads
 
 # Docker composite files
 DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux2014 common.manylinux_2_28 common.buildroot \
@@ -79,7 +60,7 @@ 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
@@ -141,20 +122,13 @@ $(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOS
 #
 # 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) \
+	$(DOCKER) $(BUILD_CMD) -t $(ORG)/web-wasm:$(TAG) \
-		$(TAG_FLAG) $(ORG)/web-wasm:latest-$(HOST_ARCH) \
+		-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"` \
@@ -164,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
+	$(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-$(HOST_ARCH) python test/run.py --exe-suffix ".js"
+	$(BIN)/dockcross-web-wasm -i $(ORG)/web-wasm:latest python test/run.py --exe-suffix ".js"
 	rm -rf web-wasm/test
 
 #
@@ -174,16 +148,20 @@ 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) \
+	$(DOCKER) $(BUILD_CMD) -t $(ORG)/web-wasi-threads:$(TAG) \
-		-t $(ORG)/web-wasi-threads:latest-$(HOST_ARCH) \
+		-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
 #
@@ -193,8 +171,8 @@ manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile manylinux2014-x64
 	@# 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) \
+	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:$(TAG) \
-		$(TAG_FLAG) $(ORG)/manylinux2014-aarch64:latest \
+		-t $(ORG)/manylinux2014-aarch64:latest \
 		--build-arg IMAGE=$(ORG)/manylinux2014-aarch64 \
 		--build-arg VERSION=$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
@@ -206,7 +184,7 @@ manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile manylinux2014-x64
 	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/cp38-cp38/bin/python test/run.py
 
@@ -215,8 +193,8 @@ manylinux2014-aarch64.test: manylinux2014-aarch64
 #
 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) \
+	$(DOCKER) build -t $(ORG)/manylinux_2_28-x64:$(TAG) \
-		$(TAG_FLAG) $(ORG)/manylinux_2_28-x64:latest \
+		-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` \
@@ -226,7 +204,7 @@ 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
 
@@ -235,8 +213,8 @@ manylinux_2_28-x64.test: manylinux_2_28-x64
 #
 manylinux2014-x64: manylinux2014-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(BUILD_DOCKER) $(BUILD_CMD) $(TAG_FLAG) $(ORG)/manylinux2014-x64:$(TAG) \
+	$(DOCKER) build -t $(ORG)/manylinux2014-x64:$(TAG) \
-		$(TAG_FLAG) $(ORG)/manylinux2014-x64:latest \
+		-t $(ORG)/manylinux2014-x64:latest \
 		--build-arg IMAGE=$(ORG)/manylinux2014-x64 \
 		--build-arg VERSION=$(TAG) \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
@@ -246,7 +224,7 @@ 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/cp38-cp38/bin/python test/run.py
 
@@ -255,7 +233,7 @@ manylinux2014-x64.test: manylinux2014-x64
 #
 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) \
@@ -266,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/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 \
+	$(DOCKER) $(BUILD_CMD) -t $(ORG)/base:latest \
-		$(TAG_FLAG) $(ORG)/base:$(TAG) \
+		-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
 #
@@ -306,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 \
+	$(DOCKER) $(BUILD_CMD) -t $(ORG)/$@:latest \
-		$(TAG_FLAG) $(ORG)/$@:$(TAG) \
+		-t $(ORG)/$@:$(TAG) \
 		--build-arg ORG=$(ORG) \
 		--build-arg IMAGE=$(ORG)/$@ \
 		--build-arg VERSION=$(TAG) \
@@ -317,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
@@ -339,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:
@@ -353,44 +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 $$@)
-	if $(BUILDAH) manifest exists $(ORG)/$(basename $@); then \
-		$(BUILDAH) manifest rm $(ORG)/$(basename $@); fi
-	$(BUILDAH) manifest create $(ORG)/$(basename $@)
-	$(BUILDAH) manifest add $(ORG)/$(basename $@) docker://$(ORG)/$(basename $@):latest-amd64
-	$(BUILDAH) manifest add $(ORG)/$(basename $@) docker://$(ORG)/$(basename $@):latest-arm64
-
-.SECONDEXPANSION:
-$(addsuffix .push,$(MULTIARCH_IMAGES) web-wasi-threads web-wasm): $$(basename $$@).manifest
-	$(BUILDAH) manifest push --all --format v2s2 $(ORG)/$(basename $@) docker://$(ORG)/$(basename $@):latest
-	$(BUILDAH) manifest push --all --format v2s2 $(ORG)/$(basename $@) docker://$(ORG)/$(basename $@):$(TAG)
-
 #
 # testing prerequisites implicit rule
 #

README.md

@@ -105,7 +105,6 @@ The dockcross script will execute the given command-line inside the container, a
 | 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 |
@@ -321,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)

android-arm/Dockerfile.in

@@ -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 \

android-arm64/Dockerfile.in

@@ -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 && \

common/common.debian

@@ -11,7 +11,6 @@ RUN \
     build-essential \
     bzip2 \
     ca-certificates \
-    ccache \
     curl \
     dirmngr \
     file \

common/common.docker

@@ -1,22 +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.1o
-
+ARG OPENSSL_HASH=9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f
-ARG OPENSSL_VERSION=openssl-1.1.1w
-ARG OPENSSL_HASH=cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8
 
 ARG CURL_VERSION=curl-7.76.0
 ARG CURL_HASH=3b4378156ba09e224008e81dcce854b7ce4d182b1f9cfb97fe5ed9e9c18c6bd3
 
-ARG PERL_VERSION=perl-5.40.1
+ARG PERL_VERSION=perl-5.32.1
-ARG PERL_HASH=02f8c45bb379ed0c3de7514fad48c714fd46be8f0b536bfd5320050165a1ee26
+ARG PERL_HASH=03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c
 
 # Image build scripts
 COPY \

common/common.label-and-env

@@ -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}

common/common.webassembly

@@ -2,8 +2,8 @@
 #
 # Common WebAssembly tools.
 
-# 2024-12, version 121
+# main 2024-04-02
-ENV BINARYEN_GIT_TAG=353b759b230dff8fb82aeb157aeb6db360d74a49
+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
+# main 2024-04-02
-ENV WABT_GIT_TAG=ea193b40d6d4a1a697d68ae855b2b3b3e263b377
+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
+ENV WASMTIME_HOME /wasi-runtimes/wasmtime
-RUN mkdir -p ${WASMTIME_HOME} && curl https://wasmtime.dev/install.sh -sSf | bash
+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"

imagefiles/build-and-install-openssl.sh

@@ -67,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

imagefiles/install-liquidprompt-binary.sh

@@ -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
 

imagefiles/wasmtime-pwd-threads.sh

@@ -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/ "$@"

linux-arm64-full/Dockerfile.in

@@ -1,7 +1,7 @@
 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
 

linux-arm64/Dockerfile.in

@@ -1,13 +1,12 @@
 ARG ORG=dockcross
-ARG HOST_ARCH=amd64
+FROM ${ORG}/base:latest
-FROM ${ORG}/base:latest-${HOST_ARCH}
 
-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_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
-ENV QEMU_SET_ENV="LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
+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 PATH ${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
-ENV ARCH=arm64
+ENV ARCH arm64
 
 #include "common.label-and-env"

linux-arm64/crosstool-ng.config

@@ -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
@@ -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_13=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_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_V_6_4=y
-CT_STRACE_VERSION="6.13"
+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_21=y
-# CT_GETTEXT_V_0_22_5 is not set
-# CT_GETTEXT_V_0_21 is not set
 # 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=y
-# CT_GMP_V_6_2 is not set
 # 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_V_1_2=y
-CT_MPC_VERSION="1.3.1"
+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=y
-# CT_ZLIB_V_1_2_13 is not set
+CT_ZLIB_VERSION="1.2.13"
-CT_ZLIB_VERSION="1.3.1"
 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=y
-# CT_ZSTD_V_1_5_5 is not set
 # 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}"

linux-armv5-musl/Dockerfile.in

@@ -1,7 +1,7 @@
 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).

linux-armv5-uclibc/Dockerfile.in

@@ -1,7 +1,7 @@
 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

linux-armv5/Dockerfile.in

@@ -1,7 +1,7 @@
 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).

linux-armv6-lts/Dockerfile.in

@@ -1,7 +1,7 @@
 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

linux-armv6/Dockerfile.in

@@ -1,7 +1,7 @@
 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

linux-armv7-lts/Dockerfile.in

@@ -1,7 +1,7 @@
 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

linux-armv7/Dockerfile.in

@@ -1,7 +1,7 @@
 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

linux-armv7a-lts/Dockerfile.in

@@ -1,7 +1,7 @@
 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
 

linux-armv7a/Dockerfile.in

@@ -1,7 +1,7 @@
 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
 

linux-armv7a/crosstool-ng.config

@@ -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_older=y
-CT_BINUTILS_2_39_or_later=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

linux-m68k-uclibc/Dockerfile.in

@@ -1,7 +1,7 @@
 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

linux-mips-lts/Dockerfile.in

@@ -1,7 +1,7 @@
 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
 

linux-mips/Dockerfile.in

@@ -1,7 +1,7 @@
 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
 

linux-mipsel-lts/Dockerfile.in

@@ -1,7 +1,7 @@
 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

linux-ppc/Dockerfile.in

@@ -1,49 +0,0 @@
-ARG ORG=dockcross
-FROM ${ORG}/base:latest
-
-LABEL maintainer="Matt McCormick matt@mmmccormick.com and Fancy2209"
-
-# Crosstool-ng version 2024-08-04
-ENV CT_VERSION crosstool-ng-1.26.0
-
-ARG QEMU_VERSION=6.0.0
-
-#include "common.crosstool"
-
-ENV CROSS_TRIPLE powerpc-unknown-linux-gnu
-
-WORKDIR /usr/src
-
-RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
-  curl -L https://download.qemu.org/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \
-  cd qemu-${QEMU_VERSION} && \
-  ./configure --target-list=ppc-linux-user --prefix=/usr && \
-  make -j$(nproc) && \
-  make install && \
-  cd .. && rm -rf qemu-${QEMU_VERSION}
-
-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}"
-
-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/powerpc-unknown-linux-gnu/pkgconfig
-
-# Linux kernel cross compilation variables
-ENV PATH ${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE ${CROSS_TRIPLE}-
-ENV ARCH powerpc
-
-#include "common.label-and-env"

linux-ppc/Toolchain.cmake

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

linux-ppc/crosstool-ng.config

@@ -1,962 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.26.0 Configuration
-#
-CT_CONFIGURE_has_static_link=y
-CT_CONFIGURE_has_cxx11=y
-CT_CONFIGURE_has_lzip=y
-CT_CONFIGURE_has_curl=y
-CT_CONFIGURE_has_meson=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
-CT_CONFIGURE_has_libtool_2_4_or_newer=y
-CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
-CT_CONFIGURE_has_autoconf_2_65_or_newer=y
-CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
-CT_CONFIGURE_has_automake_1_15_or_newer=y
-CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
-CT_CONFIGURE_has_python_3_4_or_newer=y
-CT_CONFIGURE_has_bison_2_7_or_newer=y
-CT_CONFIGURE_has_bison_3_0_4_or_newer=y
-CT_CONFIGURE_has_python=y
-CT_CONFIGURE_has_git=y
-CT_CONFIGURE_has_md5sum=y
-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.26.0"
-CT_VCHECK="load"
-CT_CONFIG_VERSION_ENV="4"
-CT_CONFIG_VERSION_CURRENT="4"
-CT_CONFIG_VERSION="4"
-CT_MODULES=y
-
-#
-# Paths and misc options
-#
-
-#
-# crosstool-NG behavior
-#
-# CT_OBSOLETE is not set
-# CT_EXPERIMENTAL is not set
-# CT_DEBUG_CT is not set
-
-#
-# Paths
-#
-CT_LOCAL_TARBALLS_DIR="${HOME}/src"
-CT_SAVE_TARBALLS=y
-# CT_TARBALLS_BUILDROOT_LAYOUT is not set
-CT_WORK_DIR="${CT_TOP_DIR}/.build"
-CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"
-CT_BUILD_DIR="${CT_BUILD_TOP_DIR}/build"
-CT_PREFIX_DIR="${CT_PREFIX:-${HOME}/x-tools}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"
-CT_RM_RF_PREFIX_DIR=y
-CT_REMOVE_DOCS=y
-CT_INSTALL_LICENSES=y
-CT_PREFIX_DIR_RO=y
-CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
-# CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES is not set
-
-#
-# Downloading
-#
-CT_DOWNLOAD_AGENT_CURL=y
-# CT_DOWNLOAD_AGENT_NONE is not set
-# CT_FORBID_DOWNLOAD is not set
-# CT_FORCE_DOWNLOAD is not set
-CT_CONNECT_TIMEOUT=10
-CT_DOWNLOAD_CURL_OPTIONS="--location --ftp-pasv --retry 3 --fail --silent"
-# CT_ONLY_DOWNLOAD is not set
-# CT_USE_MIRROR is not set
-CT_VERIFY_DOWNLOAD_DIGEST=y
-CT_VERIFY_DOWNLOAD_DIGEST_SHA512=y
-# CT_VERIFY_DOWNLOAD_DIGEST_SHA256 is not set
-# CT_VERIFY_DOWNLOAD_DIGEST_SHA1 is not set
-# CT_VERIFY_DOWNLOAD_DIGEST_MD5 is not set
-CT_VERIFY_DOWNLOAD_DIGEST_ALG="sha512"
-# CT_VERIFY_DOWNLOAD_SIGNATURE is not set
-
-#
-# Extracting
-#
-# CT_FORCE_EXTRACT is not set
-CT_OVERRIDE_CONFIG_GUESS_SUB=y
-# CT_ONLY_EXTRACT is not set
-CT_PATCH_BUNDLED=y
-# CT_PATCH_BUNDLED_LOCAL is not set
-CT_PATCH_ORDER="bundled"
-
-#
-# Build behavior
-#
-CT_PARALLEL_JOBS=0
-CT_LOAD=""
-CT_USE_PIPES=y
-CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_CXXFLAGS_FOR_BUILD=""
-CT_EXTRA_LDFLAGS_FOR_BUILD=""
-CT_EXTRA_CFLAGS_FOR_HOST=""
-CT_EXTRA_LDFLAGS_FOR_HOST=""
-# CT_CONFIG_SHELL_SH is not set
-# CT_CONFIG_SHELL_ASH is not set
-CT_CONFIG_SHELL_BASH=y
-# CT_CONFIG_SHELL_CUSTOM is not set
-CT_CONFIG_SHELL="${bash}"
-
-#
-# Logging
-#
-# CT_LOG_ERROR is not set
-# CT_LOG_WARN is not set
-# CT_LOG_INFO is not set
-CT_LOG_EXTRA=y
-# CT_LOG_ALL is not set
-# CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="EXTRA"
-# CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=y
-CT_LOG_TO_FILE=y
-CT_LOG_FILE_COMPRESS=y
-# end of Paths and misc options
-
-#
-# Target options
-#
-# CT_ARCH_ALPHA is not set
-# CT_ARCH_ARC is not set
-# CT_ARCH_ARM is not set
-# CT_ARCH_AVR is not set
-# CT_ARCH_BPF is not set
-# CT_ARCH_M68K is not set
-# CT_ARCH_MIPS is not set
-# CT_ARCH_NIOS2 is not set
-CT_ARCH_POWERPC=y
-# CT_ARCH_PRU is not set
-# CT_ARCH_S390 is not set
-# CT_ARCH_SH is not set
-# CT_ARCH_SPARC is not set
-# CT_ARCH_X86 is not set
-# CT_ARCH_XTENSA is not set
-CT_ARCH="powerpc"
-CT_ARCH_CHOICE_KSYM="POWERPC"
-CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_POWERPC_SHOW=y
-
-#
-# Options for powerpc
-#
-CT_ARCH_POWERPC_PKG_KSYM=""
-CT_ARCH_powerpc_ABI=""
-CT_ARCH_powerpc_ABI_DEFAULT=y
-# CT_ARCH_powerpc_ABI_SPE is not set
-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
-
-#
-# Generic target options
-#
-# CT_MULTILIB is not set
-CT_DEMULTILIB=y
-CT_ARCH_USE_MMU=y
-CT_ARCH_SUPPORTS_LIBSANITIZER=y
-CT_ARCH_SUPPORTS_EITHER_ENDIAN=y
-CT_ARCH_DEFAULT_BE=y
-CT_ARCH_BE=y
-# CT_ARCH_LE is not set
-CT_ARCH_ENDIAN="big"
-CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORTS_64=y
-CT_ARCH_DEFAULT_32=y
-CT_ARCH_BITNESS=32
-CT_ARCH_32=y
-# CT_ARCH_64 is not set
-CT_ARCH_SUPPORTS_WITH_32_64=y
-
-#
-# Target optimisations
-#
-CT_ARCH_SUPPORTS_WITH_ABI=y
-CT_ARCH_SUPPORTS_WITH_CPU=y
-CT_ARCH_SUPPORTS_WITH_TUNE=y
-CT_ARCH_SUPPORTS_WITH_FLOAT=y
-CT_ARCH_ABI=""
-CT_ARCH_FLOAT_AUTO=y
-# CT_ARCH_FLOAT_HW is not set
-# CT_ARCH_FLOAT_SW is not set
-CT_TARGET_CFLAGS=""
-CT_TARGET_LDFLAGS=""
-CT_ARCH_FLOAT="auto"
-# end of Target options
-
-#
-# Toolchain options
-#
-
-#
-# General toolchain options
-#
-CT_FORCE_SYSROOT=y
-CT_USE_SYSROOT=y
-CT_SYSROOT_NAME="sysroot"
-CT_SYSROOT_DIR_PREFIX=""
-CT_WANTS_STATIC_LINK=y
-CT_WANTS_STATIC_LINK_CXX=y
-# CT_STATIC_TOOLCHAIN is not set
-CT_SHOW_CT_VERSION=y
-CT_TOOLCHAIN_PKGVERSION=""
-CT_TOOLCHAIN_BUGURL=""
-
-#
-# Tuple completion and aliasing
-#
-CT_TARGET_VENDOR="unknown"
-CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS=""
-
-#
-# Toolchain type
-#
-CT_CROSS=y
-# CT_CANADIAN is not set
-CT_TOOLCHAIN_TYPE="cross"
-
-#
-# Build system
-#
-CT_BUILD=""
-CT_BUILD_PREFIX=""
-CT_BUILD_SUFFIX=""
-
-#
-# Misc options
-#
-# CT_TOOLCHAIN_ENABLE_NLS is not set
-# end of Toolchain options
-
-#
-# Operating System
-#
-CT_KERNEL_SUPPORTS_SHARED_LIBS=y
-# CT_KERNEL_BARE_METAL is not set
-CT_KERNEL_LINUX=y
-CT_KERNEL="linux"
-CT_KERNEL_CHOICE_KSYM="LINUX"
-CT_KERNEL_LINUX_SHOW=y
-
-#
-# Options for linux
-#
-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_4=y
-# CT_LINUX_V_6_3 is not set
-# CT_LINUX_V_6_2 is not set
-# CT_LINUX_V_6_1 is not set
-# CT_LINUX_V_6_0 is not set
-# CT_LINUX_V_5_19 is not set
-# CT_LINUX_V_5_18 is not set
-# CT_LINUX_V_5_17 is not set
-# CT_LINUX_V_5_16 is not set
-# CT_LINUX_V_5_15 is not set
-# CT_LINUX_V_5_14 is not set
-# CT_LINUX_V_5_13 is not set
-# CT_LINUX_V_5_12 is not set
-# CT_LINUX_V_5_11 is not set
-# CT_LINUX_V_5_10 is not set
-# CT_LINUX_V_5_9 is not set
-# CT_LINUX_V_5_8 is not set
-# CT_LINUX_V_5_7 is not set
-# CT_LINUX_V_5_4 is not set
-# CT_LINUX_V_5_3 is not set
-# CT_LINUX_V_5_2 is not set
-# CT_LINUX_V_5_1 is not set
-# CT_LINUX_V_5_0 is not set
-# CT_LINUX_V_4_20 is not set
-# CT_LINUX_V_4_19 is not set
-# CT_LINUX_V_4_18 is not set
-# CT_LINUX_V_4_17 is not set
-# CT_LINUX_V_4_16 is not set
-# CT_LINUX_V_4_15 is not set
-# CT_LINUX_V_4_14 is not set
-# CT_LINUX_V_4_13 is not set
-# CT_LINUX_V_4_12 is not set
-# CT_LINUX_V_4_11 is not set
-# CT_LINUX_V_4_10 is not set
-# CT_LINUX_V_4_9 is not set
-# CT_LINUX_V_4_4 is not set
-# CT_LINUX_V_4_1 is not set
-# CT_LINUX_V_3_16 is not set
-# 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_V_3_4 is not set
-# CT_LINUX_V_3_2 is not set
-CT_LINUX_VERSION="6.4"
-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}"
-CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign"
-CT_LINUX_later_than_5_19=y
-CT_LINUX_5_19_or_later=y
-CT_LINUX_later_than_5_12=y
-CT_LINUX_5_12_or_later=y
-CT_LINUX_later_than_5_5=y
-CT_LINUX_5_5_or_later=y
-CT_LINUX_later_than_5_3=y
-CT_LINUX_5_3_or_later=y
-CT_LINUX_later_than_4_8=y
-CT_LINUX_4_8_or_later=y
-CT_LINUX_later_than_3_7=y
-CT_LINUX_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_DEP_RSYNC=y
-CT_KERNEL_LINUX_VERBOSITY_0=y
-# CT_KERNEL_LINUX_VERBOSITY_1 is not set
-# CT_KERNEL_LINUX_VERBOSITY_2 is not set
-CT_KERNEL_LINUX_VERBOSE_LEVEL=0
-CT_ALL_KERNEL_CHOICES="BARE_METAL LINUX WINDOWS"
-
-#
-# Common kernel options
-#
-CT_SHARED_LIBS=y
-# end of Operating System
-
-#
-# Binary utilities
-#
-CT_ARCH_BINFMT_ELF=y
-CT_BINUTILS_BINUTILS=y
-CT_BINUTILS="binutils"
-CT_BINUTILS_CHOICE_KSYM="BINUTILS"
-CT_BINUTILS_BINUTILS_SHOW=y
-
-#
-# Options for binutils
-#
-CT_BINUTILS_BINUTILS_PKG_KSYM="BINUTILS"
-CT_BINUTILS_DIR_NAME="binutils"
-CT_BINUTILS_USE_GNU=y
-# CT_BINUTILS_USE_ORACLE is not set
-CT_BINUTILS_USE="BINUTILS"
-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_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_35 is not set
-# CT_BINUTILS_V_2_34 is not set
-# CT_BINUTILS_V_2_33 is not set
-# CT_BINUTILS_V_2_32 is not set
-# CT_BINUTILS_V_2_31 is not set
-# CT_BINUTILS_V_2_30 is not set
-# CT_BINUTILS_V_2_29 is not set
-# 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_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_later_than_2_30=y
-CT_BINUTILS_2_30_or_later=y
-CT_BINUTILS_later_than_2_27=y
-CT_BINUTILS_2_27_or_later=y
-CT_BINUTILS_later_than_2_26=y
-CT_BINUTILS_2_26_or_later=y
-
-#
-# GNU binutils
-#
-CT_BINUTILS_FORCE_LD_BFD_DEFAULT=y
-CT_BINUTILS_LINKER_LD=y
-CT_BINUTILS_LINKERS_LIST="ld"
-CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_PLUGINS=y
-CT_BINUTILS_RELRO=m
-CT_BINUTILS_DETERMINISTIC_ARCHIVES=y
-CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
-# CT_BINUTILS_FOR_TARGET is not set
-CT_ALL_BINUTILS_CHOICES="BINUTILS"
-# end of Binary utilities
-
-#
-# C-library
-#
-CT_LIBC_GLIBC=y
-# CT_LIBC_UCLIBC_NG is not set
-CT_LIBC="glibc"
-CT_LIBC_CHOICE_KSYM="GLIBC"
-CT_LIBC_GLIBC_SHOW=y
-
-#
-# Options for glibc
-#
-CT_LIBC_GLIBC_PKG_KSYM="GLIBC"
-CT_GLIBC_DIR_NAME="glibc"
-CT_GLIBC_USE_GNU=y
-# CT_GLIBC_USE_ORACLE is not set
-CT_GLIBC_USE="GLIBC"
-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_38=y
-# CT_GLIBC_V_2_37 is not set
-# CT_GLIBC_V_2_36 is not set
-# CT_GLIBC_V_2_35 is not set
-# CT_GLIBC_V_2_34 is not set
-# CT_GLIBC_V_2_33 is not set
-# CT_GLIBC_V_2_32 is not set
-# CT_GLIBC_V_2_31 is not set
-# CT_GLIBC_V_2_30 is not set
-# CT_GLIBC_V_2_29 is not set
-# CT_GLIBC_V_2_28 is not set
-# CT_GLIBC_V_2_27 is not set
-# CT_GLIBC_V_2_26 is not set
-# CT_GLIBC_V_2_25 is not set
-# CT_GLIBC_V_2_24 is not set
-# CT_GLIBC_V_2_23 is not set
-# CT_GLIBC_V_2_19 is not set
-# CT_GLIBC_V_2_17 is not set
-CT_GLIBC_VERSION="2.38"
-CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)"
-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_38_or_later=y
-CT_GLIBC_2_38_or_older=y
-CT_GLIBC_later_than_2_37=y
-CT_GLIBC_2_37_or_later=y
-CT_GLIBC_later_than_2_36=y
-CT_GLIBC_2_36_or_later=y
-CT_GLIBC_later_than_2_34=y
-CT_GLIBC_2_34_or_later=y
-CT_GLIBC_later_than_2_32=y
-CT_GLIBC_2_32_or_later=y
-CT_GLIBC_later_than_2_31=y
-CT_GLIBC_2_31_or_later=y
-CT_GLIBC_later_than_2_30=y
-CT_GLIBC_2_30_or_later=y
-CT_GLIBC_later_than_2_29=y
-CT_GLIBC_2_29_or_later=y
-CT_GLIBC_later_than_2_28=y
-CT_GLIBC_2_28_or_later=y
-CT_GLIBC_later_than_2_27=y
-CT_GLIBC_2_27_or_later=y
-CT_GLIBC_later_than_2_26=y
-CT_GLIBC_2_26_or_later=y
-CT_GLIBC_later_than_2_25=y
-CT_GLIBC_2_25_or_later=y
-CT_GLIBC_later_than_2_24=y
-CT_GLIBC_2_24_or_later=y
-CT_GLIBC_later_than_2_23=y
-CT_GLIBC_2_23_or_later=y
-CT_GLIBC_later_than_2_20=y
-CT_GLIBC_2_20_or_later=y
-CT_GLIBC_later_than_2_17=y
-CT_GLIBC_2_17_or_later=y
-CT_GLIBC_later_than_2_14=y
-CT_GLIBC_2_14_or_later=y
-CT_GLIBC_DEP_KERNEL_HEADERS_VERSION=y
-CT_GLIBC_DEP_BINUTILS=y
-CT_GLIBC_DEP_GCC=y
-CT_GLIBC_DEP_PYTHON=y
-CT_THREADS="nptl"
-CT_GLIBC_BUILD_SSP=y
-CT_GLIBC_HAS_LIBIDN_ADDON=y
-# CT_GLIBC_USE_LIBIDN_ADDON is not set
-CT_GLIBC_NO_SPARC_V8=y
-CT_GLIBC_HAS_OBSOLETE_LIBCRYPT=y
-CT_GLIBC_EXTRA_CONFIG_ARRAY=""
-CT_GLIBC_CONFIGPARMS=""
-CT_GLIBC_ENABLE_DEBUG=y
-CT_GLIBC_EXTRA_CFLAGS=""
-# CT_GLIBC_ENABLE_OBSOLETE_LIBCRYPT is not set
-# CT_GLIBC_DISABLE_VERSIONING is not set
-CT_GLIBC_OLDEST_ABI=""
-CT_GLIBC_FORCE_UNWIND=y
-# CT_GLIBC_LOCALES is not set
-# CT_GLIBC_KERNEL_VERSION_NONE is not set
-CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
-# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_GLIBC_MIN_KERNEL="6.4"
-CT_GLIBC_SSP_DEFAULT=y
-# CT_GLIBC_SSP_NO is not set
-# CT_GLIBC_SSP_YES is not set
-# CT_GLIBC_SSP_ALL is not set
-# CT_GLIBC_SSP_STRONG is not set
-CT_GLIBC_ENABLE_WERROR=y
-# CT_GLIBC_ENABLE_COMMON_FLAG is not set
-CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG"
-CT_LIBC_SUPPORT_THREADS_ANY=y
-CT_LIBC_SUPPORT_THREADS_NATIVE=y
-
-#
-# Common C library options
-#
-CT_THREADS_NATIVE=y
-# CT_CREATE_LDSO_CONF is not set
-CT_LIBC_XLDD=y
-# end of C-library
-
-#
-# C compiler
-#
-CT_CC_CORE_NEEDED=y
-CT_CC_SUPPORT_CXX=y
-CT_CC_SUPPORT_FORTRAN=y
-CT_CC_SUPPORT_ADA=y
-CT_CC_SUPPORT_D=y
-CT_CC_SUPPORT_JIT=y
-CT_CC_SUPPORT_OBJC=y
-CT_CC_SUPPORT_OBJCXX=y
-CT_CC_SUPPORT_GOLANG=y
-CT_CC_GCC=y
-CT_CC="gcc"
-CT_CC_CHOICE_KSYM="GCC"
-CT_CC_GCC_SHOW=y
-
-#
-# Options for gcc
-#
-CT_CC_GCC_PKG_KSYM="GCC"
-CT_GCC_DIR_NAME="gcc"
-CT_GCC_USE_GNU=y
-# CT_GCC_USE_ORACLE is not set
-CT_GCC_USE="GCC"
-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_13=y
-# CT_GCC_V_12 is not set
-# CT_GCC_V_11 is not set
-# CT_GCC_V_10 is not set
-# CT_GCC_V_9 is not set
-# CT_GCC_V_8 is not set
-# CT_GCC_V_7 is not set
-# CT_GCC_V_6 is not set
-CT_GCC_VERSION="13.2.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_later_than_13=y
-CT_GCC_13_or_later=y
-CT_GCC_later_than_12=y
-CT_GCC_12_or_later=y
-CT_GCC_later_than_11=y
-CT_GCC_11_or_later=y
-CT_GCC_later_than_10=y
-CT_GCC_10_or_later=y
-CT_GCC_later_than_9=y
-CT_GCC_9_or_later=y
-CT_GCC_later_than_8=y
-CT_GCC_8_or_later=y
-CT_GCC_later_than_7=y
-CT_GCC_7_or_later=y
-CT_GCC_later_than_6=y
-CT_GCC_6_or_later=y
-CT_GCC_REQUIRE_6_or_later=y
-CT_GCC_later_than_5=y
-CT_GCC_5_or_later=y
-CT_GCC_REQUIRE_5_or_later=y
-CT_GCC_later_than_4_9=y
-CT_GCC_4_9_or_later=y
-CT_GCC_REQUIRE_4_9_or_later=y
-CT_CC_GCC_ENABLE_PLUGINS=y
-CT_CC_GCC_HAS_LIBMPX=y
-CT_CC_GCC_ENABLE_CXX_FLAGS=""
-CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY=""
-CT_CC_GCC_EXTRA_CONFIG_ARRAY=""
-CT_CC_GCC_STATIC_LIBSTDCXX=y
-# CT_CC_GCC_SYSTEM_ZLIB is not set
-CT_CC_GCC_CONFIG_TLS=m
-
-#
-# Optimisation features
-#
-CT_CC_GCC_USE_GRAPHITE=y
-CT_CC_GCC_USE_LTO=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_LIBMUDFLAP is not set
-# CT_CC_GCC_LIBGOMP is not set
-# CT_CC_GCC_LIBSSP is not set
-# CT_CC_GCC_LIBQUADMATH is not set
-# CT_CC_GCC_LIBSANITIZER is not set
-CT_CC_GCC_LIBSTDCXX_VERBOSE=m
-
-#
-# Misc. obscure options.
-#
-CT_CC_CXA_ATEXIT=y
-CT_CC_GCC_TM_CLONE_REGISTRY=m
-# CT_CC_GCC_DISABLE_PCH is not set
-CT_CC_GCC_SJLJ_EXCEPTIONS=m
-CT_CC_GCC_LDBL_128=m
-# CT_CC_GCC_BUILD_ID is not set
-CT_CC_GCC_LNK_HASH_STYLE_DEFAULT=y
-# CT_CC_GCC_LNK_HASH_STYLE_SYSV is not set
-# CT_CC_GCC_LNK_HASH_STYLE_GNU is not set
-# CT_CC_GCC_LNK_HASH_STYLE_BOTH is not set
-CT_CC_GCC_LNK_HASH_STYLE=""
-CT_CC_GCC_DEC_FLOATS_AUTO=y
-# CT_CC_GCC_DEC_FLOATS_BID is not set
-# CT_CC_GCC_DEC_FLOATS_DPD is not set
-# CT_CC_GCC_DEC_FLOATS_NO is not set
-CT_CC_GCC_DEC_FLOATS=""
-CT_ALL_CC_CHOICES="GCC"
-
-#
-# Additional supported languages:
-#
-CT_CC_LANG_CXX=y
-# CT_CC_LANG_FORTRAN is not set
-# end of C compiler
-
-#
-# Debug facilities
-#
-CT_DEBUG_DUMA=y
-CT_DEBUG_DUMA_PKG_KSYM="DUMA"
-CT_DUMA_DIR_NAME="duma"
-CT_DUMA_PKG_NAME="duma"
-CT_DUMA_SRC_RELEASE=y
-# CT_DUMA_SRC_DEVEL is not set
-CT_DUMA_PATCH_ORDER="global"
-CT_DUMA_V_2_5_21=y
-CT_DUMA_VERSION="2_5_21"
-CT_DUMA_MIRRORS="https://github.com/johnsonjh/duma/archive/refs/tags"
-CT_DUMA_ARCHIVE_FILENAME="VERSION_@{version}"
-CT_DUMA_ARCHIVE_DIRNAME="@{pkg_name}-VERSION_@{version}"
-CT_DUMA_ARCHIVE_FORMATS=".tar.gz .zip"
-CT_DUMA_SIGNATURE_FORMAT=""
-CT_DUMA_SO=y
-CT_DUMA_CUSTOM_WRAPPER=y
-CT_DEBUG_GDB=y
-CT_DEBUG_GDB_PKG_KSYM="GDB"
-CT_GDB_DIR_NAME="gdb"
-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_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="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_13=y
-CT_GDB_13_or_later=y
-CT_GDB_later_than_12=y
-CT_GDB_12_or_later=y
-CT_GDB_later_than_11=y
-CT_GDB_11_or_later=y
-CT_GDB_later_than_10=y
-CT_GDB_10_or_later=y
-CT_GDB_later_than_8_3=y
-CT_GDB_8_3_or_later=y
-CT_GDB_CROSS=y
-# CT_GDB_CROSS_STATIC is not set
-# CT_GDB_CROSS_SIM is not set
-# CT_GDB_CROSS_PYTHON is not set
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
-CT_GDB_NATIVE=y
-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_DEBUG_LTRACE is not set
-CT_DEBUG_STRACE=y
-CT_DEBUG_STRACE_PKG_KSYM="STRACE"
-CT_STRACE_DIR_NAME="strace"
-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_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}"
-CT_STRACE_ARCHIVE_FORMATS=".tar.xz"
-CT_STRACE_SIGNATURE_FORMAT=""
-CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
-# end of Debug facilities
-
-#
-# Companion libraries
-#
-# CT_COMPLIBS_CHECK is not set
-# CT_COMP_LIBS_CLOOG is not set
-CT_COMP_LIBS_EXPAT=y
-CT_COMP_LIBS_EXPAT_PKG_KSYM="EXPAT"
-CT_EXPAT_DIR_NAME="expat"
-CT_EXPAT_PKG_NAME="expat"
-CT_EXPAT_SRC_RELEASE=y
-# CT_EXPAT_SRC_DEVEL is not set
-CT_EXPAT_PATCH_ORDER="global"
-CT_EXPAT_V_2_5=y
-CT_EXPAT_VERSION="2.5.0"
-CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION} https://github.com/libexpat/libexpat/releases/download/R_${CT_EXPAT_VERSION//./_}"
-CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_EXPAT_ARCHIVE_FORMATS=".tar.xz .tar.lz .tar.bz2 .tar.gz"
-CT_EXPAT_SIGNATURE_FORMAT=""
-CT_COMP_LIBS_GETTEXT=y
-CT_COMP_LIBS_GETTEXT_PKG_KSYM="GETTEXT"
-CT_GETTEXT_DIR_NAME="gettext"
-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_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.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_0_21_or_later=y
-CT_GETTEXT_0_21_or_older=y
-CT_GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG=y
-
-#
-# This version of gettext is not compatible with uClibc-NG. Select
-#
-
-#
-# a different version if uClibc-NG is used on the target or (in a
-#
-
-#
-# Canadian cross build) on the host.
-#
-CT_COMP_LIBS_GMP=y
-CT_COMP_LIBS_GMP_PKG_KSYM="GMP"
-CT_GMP_DIR_NAME="gmp"
-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_2=y
-# CT_GMP_V_6_1 is not set
-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}"
-CT_GMP_ARCHIVE_FORMATS=".tar.xz .tar.lz .tar.bz2"
-CT_GMP_SIGNATURE_FORMAT="packed/.sig"
-CT_COMP_LIBS_ISL=y
-CT_COMP_LIBS_ISL_PKG_KSYM="ISL"
-CT_ISL_DIR_NAME="isl"
-CT_ISL_PKG_NAME="isl"
-CT_ISL_SRC_RELEASE=y
-# CT_ISL_SRC_DEVEL is not set
-CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_26=y
-# CT_ISL_V_0_25 is not set
-# CT_ISL_V_0_24 is not set
-# CT_ISL_V_0_23 is not set
-# CT_ISL_V_0_22 is not set
-# CT_ISL_V_0_21 is not set
-# CT_ISL_V_0_20 is not set
-# CT_ISL_V_0_19 is not set
-# CT_ISL_V_0_18 is not set
-# CT_ISL_V_0_17 is not set
-# CT_ISL_V_0_16 is not set
-# CT_ISL_V_0_15 is not set
-CT_ISL_VERSION="0.26"
-CT_ISL_MIRRORS="https://libisl.sourceforge.io"
-CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
-CT_ISL_SIGNATURE_FORMAT=""
-CT_ISL_later_than_0_18=y
-CT_ISL_0_18_or_later=y
-CT_ISL_later_than_0_15=y
-CT_ISL_0_15_or_later=y
-# CT_COMP_LIBS_LIBELF is not set
-CT_COMP_LIBS_LIBICONV=y
-CT_COMP_LIBS_LIBICONV_PKG_KSYM="LIBICONV"
-CT_LIBICONV_DIR_NAME="libiconv"
-CT_LIBICONV_PKG_NAME="libiconv"
-CT_LIBICONV_SRC_RELEASE=y
-# CT_LIBICONV_SRC_DEVEL is not set
-CT_LIBICONV_PATCH_ORDER="global"
-CT_LIBICONV_V_1_16=y
-# CT_LIBICONV_V_1_15 is not set
-CT_LIBICONV_VERSION="1.16"
-CT_LIBICONV_MIRRORS="$(CT_Mirrors GNU libiconv)"
-CT_LIBICONV_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_LIBICONV_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_LIBICONV_ARCHIVE_FORMATS=".tar.gz"
-CT_LIBICONV_SIGNATURE_FORMAT="packed/.sig"
-CT_COMP_LIBS_MPC=y
-CT_COMP_LIBS_MPC_PKG_KSYM="MPC"
-CT_MPC_DIR_NAME="mpc"
-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_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}"
-CT_MPC_ARCHIVE_FORMATS=".tar.gz"
-CT_MPC_SIGNATURE_FORMAT="packed/.sig"
-CT_MPC_later_than_1_1_0=y
-CT_MPC_1_1_0_or_later=y
-CT_COMP_LIBS_MPFR=y
-CT_COMP_LIBS_MPFR_PKG_KSYM="MPFR"
-CT_MPFR_DIR_NAME="mpfr"
-CT_MPFR_PKG_NAME="mpfr"
-CT_MPFR_SRC_RELEASE=y
-# CT_MPFR_SRC_DEVEL is not set
-CT_MPFR_PATCH_ORDER="global"
-CT_MPFR_V_4_2=y
-CT_MPFR_VERSION="4.2.1"
-CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)"
-CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip"
-CT_MPFR_SIGNATURE_FORMAT="packed/.asc"
-CT_MPFR_later_than_4_0_0=y
-CT_MPFR_4_0_0_or_later=y
-CT_COMP_LIBS_NCURSES=y
-CT_COMP_LIBS_NCURSES_PKG_KSYM="NCURSES"
-CT_NCURSES_DIR_NAME="ncurses"
-CT_NCURSES_PKG_NAME="ncurses"
-CT_NCURSES_SRC_RELEASE=y
-# CT_NCURSES_SRC_DEVEL is not set
-CT_NCURSES_PATCH_ORDER="global"
-CT_NCURSES_V_6_4=y
-# CT_NCURSES_V_6_2 is not set
-# CT_NCURSES_V_6_1 is not set
-# CT_NCURSES_V_6_0 is not set
-CT_NCURSES_VERSION="6.4"
-CT_NCURSES_MIRRORS="https://invisible-mirror.net/archives/ncurses $(CT_Mirrors GNU ncurses)"
-CT_NCURSES_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_NCURSES_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_NCURSES_ARCHIVE_FORMATS=".tar.gz"
-CT_NCURSES_SIGNATURE_FORMAT="packed/.sig"
-CT_NCURSES_NEW_ABI=y
-CT_NCURSES_HOST_CONFIG_ARGS=""
-CT_NCURSES_HOST_DISABLE_DB=y
-CT_NCURSES_HOST_FALLBACKS="linux,xterm,xterm-color,xterm-256color,vt100"
-CT_NCURSES_TARGET_CONFIG_ARGS=""
-# CT_NCURSES_TARGET_DISABLE_DB is not set
-CT_NCURSES_TARGET_FALLBACKS=""
-CT_COMP_LIBS_ZLIB=y
-CT_COMP_LIBS_ZLIB_PKG_KSYM="ZLIB"
-CT_ZLIB_DIR_NAME="zlib"
-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_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}"
-CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
-CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
-CT_COMP_LIBS_ZSTD=y
-CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD"
-CT_ZSTD_DIR_NAME="zstd"
-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_5=y
-# CT_ZSTD_V_1_5_2 is not set
-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}"
-CT_ZSTD_ARCHIVE_FORMATS=".tar.gz"
-CT_ZSTD_SIGNATURE_FORMAT="packed/.sig"
-CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD"
-CT_LIBICONV_NEEDED=y
-CT_GETTEXT_NEEDED=y
-CT_GMP_NEEDED=y
-CT_GMP_TARGET=y
-CT_MPFR_NEEDED=y
-CT_MPFR_TARGET=y
-CT_ISL_NEEDED=y
-CT_MPC_NEEDED=y
-CT_EXPAT_NEEDED=y
-CT_EXPAT_TARGET=y
-CT_NCURSES_NEEDED=y
-CT_NCURSES_TARGET=y
-CT_ZLIB_NEEDED=y
-CT_ZSTD_NEEDED=y
-CT_LIBICONV=y
-CT_GETTEXT=y
-CT_GMP=y
-CT_MPFR=y
-CT_ISL=y
-CT_MPC=y
-CT_EXPAT=y
-CT_NCURSES=y
-CT_ZLIB=y
-CT_ZSTD=y
-# end of Companion libraries
-
-#
-# Companion tools
-#
-# CT_COMP_TOOLS_FOR_HOST is not set
-# CT_COMP_TOOLS_AUTOCONF is not set
-# CT_COMP_TOOLS_AUTOMAKE is not set
-# CT_COMP_TOOLS_BISON is not set
-# CT_COMP_TOOLS_DTC is not set
-# CT_COMP_TOOLS_LIBTOOL is not set
-# CT_COMP_TOOLS_M4 is not set
-# CT_COMP_TOOLS_MAKE is not set
-CT_ALL_COMP_TOOLS_CHOICES="AUTOCONF AUTOMAKE BISON DTC LIBTOOL M4 MAKE"
-# end of Companion tools

linux-ppc64le-lts/Dockerfile.in

@@ -1,7 +1,7 @@
 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 2023-09-21
 ENV CT_VERSION crosstool-ng-1.25.0

linux-ppc64le/Dockerfile.in

@@ -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 2024-08-04
+# Crosstool-ng version 2022-05-19
-ENV CT_VERSION crosstool-ng-1.26.0
+ENV CT_VERSION crosstool-ng-1.25.0
 
 ARG QEMU_VERSION=6.0.0
 

linux-ppc64le/crosstool-ng.config

@@ -1,16 +1,16 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.26.0 Configuration
+# crosstool-NG 1.25.0.26_db6f703 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_meson=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
 CT_CONFIGURE_has_libtool_2_4_or_newer=y
 CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
 CT_CONFIGURE_has_autoconf_2_65_or_newer=y
@@ -19,7 +19,6 @@ CT_CONFIGURE_has_automake_1_15_or_newer=y
 CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
 CT_CONFIGURE_has_python_3_4_or_newer=y
 CT_CONFIGURE_has_bison_2_7_or_newer=y
-CT_CONFIGURE_has_bison_3_0_4_or_newer=y
 CT_CONFIGURE_has_python=y
 CT_CONFIGURE_has_dtc=y
 CT_CONFIGURE_has_git=y
@@ -28,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.26.0"
+CT_VERSION="1.25.0.26_db6f703"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -72,7 +71,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="--passive-ftp --tries=5 -nc --progress=dot:binary"
+CT_DOWNLOAD_WGET_OPTIONS="--passive-ftp --tries=3 -nc --progress=dot:binary"
 # CT_ONLY_DOWNLOAD is not set
 # CT_USE_MIRROR is not set
 CT_VERIFY_DOWNLOAD_DIGEST=y
@@ -133,7 +132,6 @@ CT_LOG_FILE_COMPRESS=y
 # CT_ARCH_ARC is not set
 # CT_ARCH_ARM is not set
 # CT_ARCH_AVR is not set
-# CT_ARCH_BPF is not set
 # CT_ARCH_M68K is not set
 # CT_ARCH_MIPS is not set
 # CT_ARCH_NIOS2 is not set
@@ -157,7 +155,7 @@ CT_ARCH_POWERPC_PKG_KSYM=""
 CT_ARCH_powerpc_ABI=""
 CT_ARCH_powerpc_ABI_DEFAULT=y
 # CT_ARCH_powerpc_ABI_SPE is not set
-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_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
 CT_ARCH_SUFFIX=""
 # CT_OMIT_TARGET_VENDOR is not set
 
@@ -167,7 +165,6 @@ CT_ARCH_SUFFIX=""
 # CT_MULTILIB is not set
 CT_DEMULTILIB=y
 CT_ARCH_USE_MMU=y
-CT_ARCH_SUPPORTS_LIBSANITIZER=y
 CT_ARCH_SUPPORTS_EITHER_ENDIAN=y
 CT_ARCH_DEFAULT_BE=y
 # CT_ARCH_BE is not set
@@ -218,7 +215,7 @@ CT_TOOLCHAIN_BUGURL=""
 #
 # Tuple completion and aliasing
 #
-CT_TARGET_VENDOR="unknown"
+CT_TARGET_VENDOR=""
 CT_TARGET_ALIAS_SED_EXPR=""
 CT_TARGET_ALIAS=""
 
@@ -264,17 +261,10 @@ 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_4 is not set
-# CT_LINUX_V_6_3 is not set
-# CT_LINUX_V_6_2 is not set
-CT_LINUX_V_6_1=y
-# CT_LINUX_V_6_0 is not set
-# CT_LINUX_V_5_19 is not set
-# CT_LINUX_V_5_18 is not set
 # CT_LINUX_V_5_17 is not set
 # CT_LINUX_V_5_16 is not set
 # CT_LINUX_V_5_15 is not set
-# CT_LINUX_V_5_14 is not set
+CT_LINUX_V_5_14=y
 # CT_LINUX_V_5_13 is not set
 # CT_LINUX_V_5_12 is not set
 # CT_LINUX_V_5_11 is not set
@@ -307,14 +297,12 @@ CT_LINUX_V_6_1=y
 # CT_LINUX_V_3_10 is not set
 # CT_LINUX_V_3_4 is not set
 # CT_LINUX_V_3_2 is not set
-CT_LINUX_VERSION="6.1.35"
+CT_LINUX_VERSION="5.14.18"
 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}"
 CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign"
-CT_LINUX_later_than_5_19=y
-CT_LINUX_5_19_or_later=y
 CT_LINUX_later_than_5_12=y
 CT_LINUX_5_12_or_later=y
 CT_LINUX_later_than_5_5=y
@@ -362,8 +350,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_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=y
 # CT_BINUTILS_V_2_36 is not set
@@ -383,8 +369,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_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
@@ -428,11 +412,8 @@ 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_38 is not set
-# CT_GLIBC_V_2_37 is not set
-CT_GLIBC_V_2_36=y
 # CT_GLIBC_V_2_35 is not set
-# CT_GLIBC_V_2_34 is not set
+CT_GLIBC_V_2_34=y
 # CT_GLIBC_V_2_33 is not set
 # CT_GLIBC_V_2_32 is not set
 # CT_GLIBC_V_2_31 is not set
@@ -446,20 +427,14 @@ CT_GLIBC_V_2_36=y
 # CT_GLIBC_V_2_23 is not set
 # CT_GLIBC_V_2_19 is not set
 # CT_GLIBC_V_2_17 is not set
-CT_GLIBC_VERSION="2.36"
+CT_GLIBC_VERSION="2.34"
 CT_GLIBC_MIRRORS="$(CT_Mirrors GNU glibc)"
 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_38_or_older=y
-CT_GLIBC_older_than_2_38=y
-CT_GLIBC_2_37_or_older=y
-CT_GLIBC_older_than_2_37=y
-CT_GLIBC_2_36_or_later=y
-CT_GLIBC_2_36_or_older=y
-CT_GLIBC_later_than_2_34=y
 CT_GLIBC_2_34_or_later=y
+CT_GLIBC_2_34_or_older=y
 CT_GLIBC_later_than_2_32=y
 CT_GLIBC_2_32_or_later=y
 CT_GLIBC_later_than_2_31=y
@@ -497,24 +472,24 @@ CT_GLIBC_HAS_LIBIDN_ADDON=y
 CT_GLIBC_NO_SPARC_V8=y
 CT_GLIBC_EXTRA_CONFIG_ARRAY=""
 CT_GLIBC_CONFIGPARMS=""
-CT_GLIBC_ENABLE_DEBUG=y
 CT_GLIBC_EXTRA_CFLAGS=""
 # CT_GLIBC_DISABLE_VERSIONING is not set
 CT_GLIBC_OLDEST_ABI=""
 CT_GLIBC_FORCE_UNWIND=y
 # CT_GLIBC_LOCALES is not set
 # CT_GLIBC_KERNEL_VERSION_NONE is not set
-CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-# CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_GLIBC_MIN_KERNEL="6.1.35"
+CT_GLIBC_MIN_KERNEL_VERSION="5.4.0"
+CT_GLIBC_MIN_KERNEL="5.4.0"
 CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_NO is not set
 # CT_GLIBC_SSP_YES is not set
 # CT_GLIBC_SSP_ALL is not set
 # CT_GLIBC_SSP_STRONG is not set
-CT_GLIBC_ENABLE_WERROR=y
+# CT_GLIBC_ENABLE_WERROR is not set
 # CT_GLIBC_ENABLE_COMMON_FLAG is not set
-CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG"
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
 
@@ -533,8 +508,6 @@ CT_CC_CORE_NEEDED=y
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_ADA=y
-CT_CC_SUPPORT_D=y
-CT_CC_SUPPORT_JIT=y
 CT_CC_SUPPORT_OBJC=y
 CT_CC_SUPPORT_OBJCXX=y
 CT_CC_SUPPORT_GOLANG=y
@@ -549,30 +522,26 @@ CT_CC_GCC_SHOW=y
 CT_CC_GCC_PKG_KSYM="GCC"
 CT_GCC_DIR_NAME="gcc"
 CT_GCC_USE_GNU=y
-# CT_GCC_USE_ORACLE is not set
 CT_GCC_USE="GCC"
 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_13 is not set
+# CT_GCC_V_12 is not set
-CT_GCC_V_12=y
+CT_GCC_V_11=y
-# CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
 # 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.3.0"
+CT_GCC_VERSION="11.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_13_or_older=y
+CT_GCC_12_or_older=y
-CT_GCC_older_than_13=y
+CT_GCC_older_than_12=y
-CT_GCC_later_than_12=y
-CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
 CT_GCC_11_or_later=y
 CT_GCC_later_than_10=y
@@ -611,14 +580,12 @@ 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_LIBMUDFLAP=y
 CT_CC_GCC_LIBGOMP=y
 CT_CC_GCC_LIBSSP=m
-# CT_CC_GCC_LIBQUADMATH is not set
+CT_CC_GCC_LIBQUADMATH=y
-# CT_CC_GCC_LIBSANITIZER is not set
+CT_CC_GCC_LIBSANITIZER=y
-CT_CC_GCC_LIBSTDCXX_VERBOSE=m
 
 #
 # Misc. obscure options.
@@ -645,7 +612,7 @@ CT_ALL_CC_CHOICES="GCC"
 # Additional supported languages:
 #
 CT_CC_LANG_CXX=y
-# CT_CC_LANG_FORTRAN is not set
+CT_CC_LANG_FORTRAN=y
 # end of C compiler
 
 #
@@ -659,20 +626,17 @@ 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_13=y
+CT_GDB_V_12=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="13.2"
+CT_GDB_VERSION="12.1"
 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_13=y
-CT_GDB_13_or_later=y
 CT_GDB_later_than_12=y
 CT_GDB_12_or_later=y
 CT_GDB_later_than_11=y
@@ -721,8 +685,8 @@ CT_EXPAT_PKG_NAME="expat"
 CT_EXPAT_SRC_RELEASE=y
 # CT_EXPAT_SRC_DEVEL is not set
 CT_EXPAT_PATCH_ORDER="global"
-CT_EXPAT_V_2_5=y
+CT_EXPAT_V_2_4=y
-CT_EXPAT_VERSION="2.5.0"
+CT_EXPAT_VERSION="2.4.1"
 CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION} https://github.com/libexpat/libexpat/releases/download/R_${CT_EXPAT_VERSION//./_}"
 CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -735,30 +699,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_21=y
+# CT_GETTEXT_V_0_21 is not set
-# CT_GETTEXT_V_0_20_1 is not set
+CT_GETTEXT_V_0_20_1=y
 # CT_GETTEXT_V_0_19_8_1 is not set
-CT_GETTEXT_VERSION="0.21"
+CT_GETTEXT_VERSION="0.20.1"
 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_0_21_or_later=y
 CT_GETTEXT_0_21_or_older=y
-CT_GETTEXT_INCOMPATIBLE_WITH_UCLIBC_NG=y
+CT_GETTEXT_older_than_0_21=y
-
-#
-# This version of gettext is not compatible with uClibc-NG. Select
-#
-
-#
-# a different version if uClibc-NG is used on the target or (in a
-#
-
-#
-# Canadian cross build) on the host.
-#
 CT_COMP_LIBS_GMP=y
 CT_COMP_LIBS_GMP_PKG_KSYM="GMP"
 CT_GMP_DIR_NAME="gmp"
@@ -781,9 +732,7 @@ CT_ISL_PKG_NAME="isl"
 CT_ISL_SRC_RELEASE=y
 # CT_ISL_SRC_DEVEL is not set
 CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_26=y
+CT_ISL_V_0_24=y
-# CT_ISL_V_0_25 is not set
-# CT_ISL_V_0_24 is not set
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
 # CT_ISL_V_0_21 is not set
@@ -793,7 +742,7 @@ CT_ISL_V_0_26=y
 # CT_ISL_V_0_17 is not set
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
-CT_ISL_VERSION="0.26"
+CT_ISL_VERSION="0.24"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -803,20 +752,7 @@ CT_ISL_later_than_0_18=y
 CT_ISL_0_18_or_later=y
 CT_ISL_later_than_0_15=y
 CT_ISL_0_15_or_later=y
-CT_COMP_LIBS_LIBELF=y
+# CT_COMP_LIBS_LIBELF is not set
-CT_COMP_LIBS_LIBELF_PKG_KSYM="LIBELF"
-CT_LIBELF_DIR_NAME="libelf"
-CT_LIBELF_PKG_NAME="libelf"
-CT_LIBELF_SRC_RELEASE=y
-# CT_LIBELF_SRC_DEVEL is not set
-CT_LIBELF_PATCH_ORDER="global"
-CT_LIBELF_V_0_8=y
-CT_LIBELF_VERSION="0.8.13"
-CT_LIBELF_MIRRORS="https://fossies.org/linux/misc/old http://oe-lite.org/mirror/libelf/ http://ftp.osuosl.org/pub/blfs/conglomeration/libelf/"
-CT_LIBELF_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_LIBELF_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_LIBELF_ARCHIVE_FORMATS=".tar.gz"
-CT_LIBELF_SIGNATURE_FORMAT=""
 CT_COMP_LIBS_LIBICONV=y
 CT_COMP_LIBS_LIBICONV_PKG_KSYM="LIBICONV"
 CT_LIBICONV_DIR_NAME="libiconv"
@@ -840,8 +776,10 @@ CT_MPC_SRC_RELEASE=y
 # CT_MPC_SRC_DEVEL is not set
 CT_MPC_PATCH_ORDER="global"
 CT_MPC_V_1_2=y
+# CT_MPC_V_1_1 is not set
+# CT_MPC_V_1_0 is not set
 CT_MPC_VERSION="1.2.1"
-CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)"
+CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)"
 CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_MPC_ARCHIVE_FORMATS=".tar.gz"
@@ -855,9 +793,11 @@ CT_MPFR_PKG_NAME="mpfr"
 CT_MPFR_SRC_RELEASE=y
 # CT_MPFR_SRC_DEVEL is not set
 CT_MPFR_PATCH_ORDER="global"
-CT_MPFR_V_4_2=y
+CT_MPFR_V_4_1=y
-CT_MPFR_VERSION="4.2.1"
+# CT_MPFR_V_4_0 is not set
-CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)"
+# CT_MPFR_V_3_1 is not set
+CT_MPFR_VERSION="4.1.0"
+CT_MPFR_MIRRORS="http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)"
 CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip"
@@ -871,11 +811,10 @@ CT_NCURSES_PKG_NAME="ncurses"
 CT_NCURSES_SRC_RELEASE=y
 # CT_NCURSES_SRC_DEVEL is not set
 CT_NCURSES_PATCH_ORDER="global"
-CT_NCURSES_V_6_4=y
+CT_NCURSES_V_6_2=y
-# CT_NCURSES_V_6_2 is not set
 # CT_NCURSES_V_6_1 is not set
 # CT_NCURSES_V_6_0 is not set
-CT_NCURSES_VERSION="6.4"
+CT_NCURSES_VERSION="6.2"
 CT_NCURSES_MIRRORS="https://invisible-mirror.net/archives/ncurses $(CT_Mirrors GNU ncurses)"
 CT_NCURSES_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_NCURSES_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -895,35 +834,19 @@ 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_2_13=y
+CT_ZLIB_V_1_2_12=y
-CT_ZLIB_VERSION="1.2.13"
+CT_ZLIB_VERSION="1.2.12"
-CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/"
+CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/ https://www.zlib.net/fossils"
 CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
-CT_COMP_LIBS_ZSTD=y
+CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB"
-CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD"
-CT_ZSTD_DIR_NAME="zstd"
-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_5=y
-# CT_ZSTD_V_1_5_2 is not set
-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}"
-CT_ZSTD_ARCHIVE_FORMATS=".tar.gz"
-CT_ZSTD_SIGNATURE_FORMAT="packed/.sig"
-CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD"
 CT_LIBICONV_NEEDED=y
 CT_GETTEXT_NEEDED=y
 CT_GMP_NEEDED=y
 CT_GMP_TARGET=y
 CT_MPFR_NEEDED=y
-CT_MPFR_TARGET=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
 CT_EXPAT_NEEDED=y
@@ -931,7 +854,6 @@ CT_EXPAT_TARGET=y
 CT_NCURSES_NEEDED=y
 CT_NCURSES_TARGET=y
 CT_ZLIB_NEEDED=y
-CT_ZSTD_NEEDED=y
 CT_LIBICONV=y
 CT_GETTEXT=y
 CT_GMP=y
@@ -941,7 +863,6 @@ CT_MPC=y
 CT_EXPAT=y
 CT_NCURSES=y
 CT_ZLIB=y
-CT_ZSTD=y
 # end of Companion libraries
 
 #

linux-riscv32/Dockerfile.in

@@ -1,7 +1,7 @@
 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

linux-riscv64/Dockerfile.in

@@ -1,7 +1,7 @@
 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

linux-s390x/Dockerfile.in

@@ -1,7 +1,7 @@
 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 S390X Linux machine
 

linux-x64-clang/Dockerfile.in

@@ -1,7 +1,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ARG CLANG_VERSION=15
 ENV CLANG_VERSION=${CLANG_VERSION}

linux-x64-tinycc/Dockerfile.in

@@ -1,7 +1,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 # This image use Tinycc as C compiler and GCC as C++ compiler
 

linux-x64/Dockerfile.in

@@ -1,7 +1,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 RUN apt-get update && \
     apt-get -y install \

linux-x86/Dockerfile.in

@@ -1,7 +1,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 RUN dpkg --add-architecture i386 && \
   apt-get update && apt-get -y install \

linux-x86_64-full/Dockerfile.in

@@ -1,7 +1,7 @@
 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 x86 Linux machine
 

linux-xtensa-uclibc/Dockerfile.in

@@ -1,7 +1,7 @@
 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

manylinux2014-aarch64/Dockerfile.in

@@ -5,7 +5,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/manylinux2014-x64:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 # This is for 64-bit ARM Manylinux machine
 

manylinux2014-x64/Dockerfile.in

@@ -1,7 +1,7 @@
 # Recent versions address yum functionality
 FROM quay.io/pypa/manylinux2014_x86_64:2024-07-20-e0def9a
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2014-x64
 

manylinux2014-x86/Dockerfile.in

@@ -1,7 +1,7 @@
 # Recent versions address yum functionality
 FROM quay.io/pypa/manylinux2014_i686:2024-07-20-e0def9a  
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2014-x86
 

manylinux_2_28-x64/Dockerfile.in

@@ -1,7 +1,7 @@
 # Recent versions address yum functionality
 FROM quay.io/pypa/manylinux_2_28_x86_64:2024-07-20-e0def9a
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux_2_28-x64
 

test/run.py

@@ -44,7 +44,7 @@ def test_cmake_build_system(build_dir, language, source, emulator, linker_flags,
     print('Building ' + source + ' with CMake...')
 
     with open('CMakeLists.txt', 'w') as fp:
-        fp.write('cmake_minimum_required(VERSION 3.16)\n')
+        fp.write('cmake_minimum_required(VERSION 3.0)\n')
         fp.write('project(test-compiler)\n')
         fp.write('add_executable(a.out ' + os.path.basename(source) + ')\n')
         if emulator:

tools/dockcross-cmake-builder.sh

@@ -1,20 +1,12 @@
 #!/usr/bin/env bash
 
-set -x
-
 if (( $# >= 1 )); then
-    image_complete=$1
+    image_complet=$1
-    image=${image_complete%:*}
+    image=${image_complet%:*}
-    tag=${image_complete#*:}
+    tag=${image_complet#*:}
     build_file=build-$image
-    host_arch=$(uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')
     if test $tag = $image; then
-        # use multiarch image if available
+        tag="latest"
-        if docker images | grep dockcross/${image} | grep latest-${host_arch} >/dev/null; then
-          tag="latest-${host_arch}"
-        else
-          tag="latest"
-        fi
     fi
     shift 1
 
@@ -25,7 +17,7 @@ if (( $# >= 1 )); then
 #    docker pull "dockcross/$image:$tag"
 
     echo "Make script dockcross-$image"
-    docker run --rm dockcross/"$image:$tag" > ./dockcross-"$image"
+    docker run --rm dockcross/"$image" > ./dockcross-"$image"
     chmod +x ./dockcross-"$image"
 
     echo "Build $build_file"

tools/dockcross-command.sh

@@ -4,14 +4,8 @@ if (( $# >= 2 )); then
     image_complet=$1
     image=${image_complet%:*}
     tag=${image_complet#*:}
-    host_arch=$(uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')
     if test $tag = $image; then
-        # use multiarch image if available
+        tag="latest"
-        if docker images | grep dockcross/${image} | grep latest-${host_arch} >/dev/null; then
-          tag="latest-${host_arch}"
-        else
-          tag="latest"
-        fi
     fi
     shift 1
 
@@ -22,7 +16,7 @@ if (( $# >= 2 )); then
 #    docker pull "dockcross/$image:$tag"
 
     echo "Make script dockcross-$image"
-    docker run --rm dockcross/"$image:$tag" > ./dockcross-"$image"
+    docker run --rm dockcross/"$image" > ./dockcross-"$image"
     chmod +x ./dockcross-"$image"
     
     echo "Run command in dockcross-$image"

tools/dockcross-make-builder.sh

@@ -1,19 +1,10 @@
 #!/usr/bin/env bash
 
 if (( $# >= 1 )); then
-    image_complete=$1
+    image_complet=$1
-    image=${image_complete%:*}
+    image=${image_complet%:*}
-    tag=${image_complete#*:}
+    tag=${image_complet#*:}
     build_file=build-$image
-    host_arch=$(uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')
-    if test $tag = $image; then
-        # use multiarch image if available
-        if docker images | grep dockcross/${image} | grep latest-${host_arch} >/dev/null; then
-          tag="latest-${host_arch}"
-        else
-          tag="latest"
-        fi
-    fi
     shift 1
 
     make_arg=$*
@@ -23,11 +14,11 @@ if (( $# >= 1 )); then
 #    docker pull "dockcross/$image:$tag"
 
     echo "Make script dockcross-$image"
-    docker run --rm dockcross/"$image:$tag" > ./dockcross-"$image"
+    docker run --rm dockcross/"$image" > ./dockcross-"$image"
     chmod +x ./dockcross-"$image"
 
     echo "Build $build_file"
-    ./dockcross-"$image" -i dockcross/"$image:$tag" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
+    ./dockcross-"$image" -i dockcross/"$image":latest bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
 else
     echo "Usage: ${0##*/} <docker image (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
     exit 1

web-wasi-emulated-threads/CheckTypeSize.c.in

@@ -1,37 +0,0 @@
-@headers@
-
-#undef KEY
-#if defined(__i386)
-# define KEY '_','_','i','3','8','6'
-#elif defined(__x86_64)
-# define KEY '_','_','x','8','6','_','6','4'
-#elif defined(__ppc__)
-# define KEY '_','_','p','p','c','_','_'
-#elif defined(__ppc64__)
-# define KEY '_','_','p','p','c','6','4','_','_'
-#endif
-
-#define SIZE (sizeof(@type@))
-char info_size[] =  {'I', 'N', 'F', 'O', ':', 's','i','z','e','[',
-  ('0' + ((SIZE / 10000)%10)),
-  ('0' + ((SIZE / 1000)%10)),
-  ('0' + ((SIZE / 100)%10)),
-  ('0' + ((SIZE / 10)%10)),
-  ('0' +  (SIZE    % 10)),
-  ']',
-#ifdef KEY
-  ' ','k','e','y','[', KEY, ']',
-#endif
-  '\0'};
-
-#ifdef __CLASSIC_C__
-int main(argc, argv) int argc; char *argv[];
-#else
-int main(int argc, char *argv[])
-#endif
-{
-  int require = 0;
-  require += info_size[argc];
-  (void)argv;
-  return SIZE;
-}

web-wasi-emulated-threads/CheckTypeSize.cmake

@@ -1,231 +0,0 @@
-#.rst:
-# CheckTypeSize
-# -------------
-#
-# Check sizeof a type
-#
-# ::
-#
-#   CHECK_TYPE_SIZE(TYPE VARIABLE [BUILTIN_TYPES_ONLY]
-#                                 [LANGUAGE <language>])
-#
-# Check if the type exists and determine its size.  On return,
-# "HAVE_${VARIABLE}" holds the existence of the type, and "${VARIABLE}"
-# holds one of the following:
-#
-# ::
-#
-#    <size> = type has non-zero size <size>
-#    "0"    = type has arch-dependent size (see below)
-#    ""     = type does not exist
-#
-# Both ``HAVE_${VARIABLE}`` and ``${VARIABLE}`` will be created as internal
-# cache variables.
-#
-# Furthermore, the variable "${VARIABLE}_CODE" holds C preprocessor code
-# to define the macro "${VARIABLE}" to the size of the type, or leave
-# the macro undefined if the type does not exist.
-#
-# The variable "${VARIABLE}" may be "0" when CMAKE_OSX_ARCHITECTURES has
-# multiple architectures for building OS X universal binaries.  This
-# indicates that the type size varies across architectures.  In this
-# case "${VARIABLE}_CODE" contains C preprocessor tests mapping from
-# each architecture macro to the corresponding type size.  The list of
-# architecture macros is stored in "${VARIABLE}_KEYS", and the value for
-# each key is stored in "${VARIABLE}-${KEY}".
-#
-# If the BUILTIN_TYPES_ONLY option is not given, the macro checks for
-# headers <sys/types.h>, <stdint.h>, and <stddef.h>, and saves results
-# in HAVE_SYS_TYPES_H, HAVE_STDINT_H, and HAVE_STDDEF_H.  The type size
-# check automatically includes the available headers, thus supporting
-# checks of types defined in the headers.
-#
-# If LANGUAGE is set, the specified compiler will be used to perform the
-# check. Acceptable values are C and CXX
-#
-# Despite the name of the macro you may use it to check the size of more
-# complex expressions, too.  To check e.g.  for the size of a struct
-# member you can do something like this:
-#
-# ::
-#
-#   check_type_size("((struct something*)0)->member" SIZEOF_MEMBER)
-#
-#
-#
-# The following variables may be set before calling this macro to modify
-# the way the check is run:
-#
-# ::
-#
-#   CMAKE_REQUIRED_FLAGS = string of compile command line flags
-#   CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
-#   CMAKE_REQUIRED_INCLUDES = list of include directories
-#   CMAKE_REQUIRED_LIBRARIES = list of libraries to link
-#   CMAKE_REQUIRED_QUIET = execute quietly without messages
-#   CMAKE_EXTRA_INCLUDE_FILES = list of extra headers to include
-
-#=============================================================================
-# Copyright 2002-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-include(CheckIncludeFile)
-include(CheckIncludeFileCXX)
-
-cmake_policy(PUSH)
-cmake_policy(VERSION 3.0)
-
-get_filename_component(__check_type_size_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
-
-#-----------------------------------------------------------------------------
-# Helper function.  DO NOT CALL DIRECTLY.
-function(__check_type_size_impl type var map builtin language)
-  if(NOT CMAKE_REQUIRED_QUIET)
-    message(STATUS "Check size of ${type}")
-  endif()
-
-  # Include header files.
-  set(headers)
-  if(builtin)
-    if(HAVE_SYS_TYPES_H)
-      set(headers "${headers}#include <sys/types.h>\n")
-    endif()
-    if(HAVE_STDINT_H)
-      set(headers "${headers}#include <stdint.h>\n")
-    endif()
-    if(HAVE_STDDEF_H)
-      set(headers "${headers}#include <stddef.h>\n")
-    endif()
-  endif()
-  foreach(h ${CMAKE_EXTRA_INCLUDE_FILES})
-    set(headers "${headers}#include \"${h}\"\n")
-  endforeach()
-
-  # Perform the check.
-
-  if("${language}" STREQUAL "C")
-    set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.c)
-  elseif("${language}" STREQUAL "CXX")
-    set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.cpp)
-  else()
-    message(FATAL_ERROR "Unknown language:\n  ${language}\nSupported languages: C, CXX.\n")
-  endif()
-  set(bin ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.bin)
-  configure_file(${__check_type_size_dir}/CheckTypeSize.c.in ${src} @ONLY)
-  try_run(${var}_run_result HAVE_${var} ${CMAKE_BINARY_DIR} ${src}
-    COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
-    LINK_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
-    CMAKE_FLAGS
-      "-DCOMPILE_DEFINITIONS:STRING=${CMAKE_REQUIRED_FLAGS}"
-      "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-    RUN_OUTPUT_VARIABLE ${var}_run_output
-    COMPILE_OUTPUT_VARIABLE output
-    )
-
-  if(${HAVE_${var}} AND NOT "${${var}_run_result}" STREQUAL "FAILED_TO_RUN")
-    set(${var} ${${var}_run_result})
-    if(NOT CMAKE_REQUIRED_QUIET)
-      message(STATUS "Check size of ${type} - done")
-    endif()
-    file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-      "Determining size of ${type} passed with the following output:\n${output}\n\n")
-    set(${var} "${${var}}" CACHE INTERNAL "CHECK_TYPE_SIZE: sizeof(${type})")
-  else()
-    # The check failed to compile.
-    if(NOT CMAKE_REQUIRED_QUIET)
-      message(STATUS "Check size of ${type} - failed")
-    endif()
-    file(READ ${src} content)
-    file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-      "Determining size of ${type} failed with the following output:\n${output}\n${src}:\n${content}\n\n")
-    set(${var} "" CACHE INTERNAL "CHECK_TYPE_SIZE: ${type} unknown")
-    file(REMOVE ${map})
-  endif()
-endfunction()
-
-#-----------------------------------------------------------------------------
-macro(CHECK_TYPE_SIZE TYPE VARIABLE)
-  # parse arguments
-  unset(doing)
-  foreach(arg ${ARGN})
-    if("x${arg}" STREQUAL "xBUILTIN_TYPES_ONLY")
-      set(_CHECK_TYPE_SIZE_${arg} 1)
-      unset(doing)
-    elseif("x${arg}" STREQUAL "xLANGUAGE") # change to MATCHES for more keys
-      set(doing "${arg}")
-      set(_CHECK_TYPE_SIZE_${doing} "")
-    elseif("x${doing}" STREQUAL "xLANGUAGE")
-      set(_CHECK_TYPE_SIZE_${doing} "${arg}")
-      unset(doing)
-    else()
-      message(FATAL_ERROR "Unknown argument:\n  ${arg}\n")
-    endif()
-  endforeach()
-  if("x${doing}" MATCHES "^x(LANGUAGE)$")
-    message(FATAL_ERROR "Missing argument:\n  ${doing} arguments requires a value\n")
-  endif()
-  if(DEFINED _CHECK_TYPE_SIZE_LANGUAGE)
-    if(NOT "x${_CHECK_TYPE_SIZE_LANGUAGE}" MATCHES "^x(C|CXX)$")
-      message(FATAL_ERROR "Unknown language:\n  ${_CHECK_TYPE_SIZE_LANGUAGE}.\nSupported languages: C, CXX.\n")
-    endif()
-    set(_language ${_CHECK_TYPE_SIZE_LANGUAGE})
-  else()
-    set(_language C)
-  endif()
-
-  # Optionally check for standard headers.
-  if(_CHECK_TYPE_SIZE_BUILTIN_TYPES_ONLY)
-    set(_builtin 0)
-  else()
-    set(_builtin 1)
-    if("${_language}" STREQUAL "C")
-      check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-      check_include_file(stdint.h HAVE_STDINT_H)
-      check_include_file(stddef.h HAVE_STDDEF_H)
-    elseif("${_language}" STREQUAL "CXX")
-      check_include_file_cxx(sys/types.h HAVE_SYS_TYPES_H)
-      check_include_file_cxx(stdint.h HAVE_STDINT_H)
-      check_include_file_cxx(stddef.h HAVE_STDDEF_H)
-    endif()
-  endif()
-  unset(_CHECK_TYPE_SIZE_BUILTIN_TYPES_ONLY)
-  unset(_CHECK_TYPE_SIZE_LANGUAGE)
-
-  # Compute or load the size or size map.
-  set(${VARIABLE}_KEYS)
-  set(_map_file ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${VARIABLE}.cmake)
-  if(NOT DEFINED HAVE_${VARIABLE})
-    __check_type_size_impl(${TYPE} ${VARIABLE} ${_map_file} ${_builtin} ${_language})
-  endif()
-  include(${_map_file} OPTIONAL)
-  set(_map_file)
-  set(_builtin)
-
-  # Create preprocessor code.
-  if(${VARIABLE}_KEYS)
-    set(${VARIABLE}_CODE)
-    set(_if if)
-    foreach(key ${${VARIABLE}_KEYS})
-      set(${VARIABLE}_CODE "${${VARIABLE}_CODE}#${_if} defined(${key})\n# define ${VARIABLE} ${${VARIABLE}-${key}}\n")
-      set(_if elif)
-    endforeach()
-    set(${VARIABLE}_CODE "${${VARIABLE}_CODE}#else\n# error ${VARIABLE} unknown\n#endif")
-    set(_if)
-  elseif(${VARIABLE})
-    set(${VARIABLE}_CODE "#define ${VARIABLE} ${${VARIABLE}}")
-  else()
-    set(${VARIABLE}_CODE "/* #undef ${VARIABLE} */")
-  endif()
-endmacro()
-
-#-----------------------------------------------------------------------------
-cmake_policy(POP)

web-wasi-emulated-threads/Dockerfile.in

@@ -1,42 +0,0 @@
-ARG ORG=dockcross
-ARG HOST_ARCH=amd64
-FROM ${ORG}/base:latest-${HOST_ARCH}
-
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
-
-ENV LLVM_VERSION=19
-ENV WASI_VERSION=25
-ENV WASI_VERSION_FULL=${WASI_VERSION}.0
-
-ENV WASMTIME_HOME=/wasi-runtimes/wasmtime
-RUN mkdir -p ${WASMTIME_HOME} && curl https://wasmtime.dev/install.sh -sSf | bash
-ENV PATH="$WASMTIME_HOME/bin:$PATH"
-
-COPY download-build-install-wasi-sdk.sh /usr/local/bin/
-RUN /usr/local/bin/download-build-install-wasi-sdk.sh
-
-ENV WASI_SYSROOT=/opt/wasi-sdk/share/wasi-sysroot
-ENV WASI_SDK_PATH=/opt/wasi-sdk
-
-COPY clang-wasi-sysroot.sh clang++-wasi-sysroot.sh /usr/local/bin/
-
-ENV CROSS_TRIPLE=wasm32-wasi
-ENV CROSS_ROOT=${WASI_SDK_PATH}
-ENV AR=${WASI_SDK_PATH}/bin/llvm-ar \
-    CC=clang-wasi-sysroot.sh \
-    CXX=clang++-wasi-sysroot.sh \
-    LD=${WASI_SDK_PATH}/bin/wasm-ld \
-    RANLIB=${WASI_SDK_PATH}/bin/llvm-ranlib
-
-#include "common.webassembly"
-
-COPY WASI.cmake /usr/src/
-RUN mv /usr/src/WASI.cmake /usr/share/cmake-*/Modules/Platform/
-COPY *.cmake /usr/src/
-RUN mv /usr/src/*.cmake /usr/share/cmake-*/Modules/
-COPY CheckTypeSize.c.in /usr/src/
-RUN mv /usr/src/CheckTypeSize.c.in /usr/share/cmake-*/Modules/
-COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE=${CROSS_ROOT}/Toolchain.cmake
-
-#include "common.label-and-env"

web-wasi-emulated-threads/FindOpenAL.cmake

@@ -1,25 +0,0 @@
-# Locate OpenAL
-# This module defines
-# OPENAL_LIBRARY
-# OPENAL_FOUND, if false, do not try to link to OpenAL
-# OPENAL_INCLUDE_DIR, where to find the headers
-
-# The implementation is based on the standard FindOpenAL.cmake provided with CMake,
-# but customized for targeting Emscripten only.
-
-if (NOT OPENAL_FOUND)
-	SET(OPENAL_FOUND TRUE)
-
-	# For Emscripten-compiled apps in the test suite (test_alut), this is expected...
-	SET(OPENAL_INCLUDE_DIR "${EMSCRIPTEN_ROOT_PATH}/system/include")
-	# ... but the stock FindOpenAL.cmake would have returned this.
-	#SET(OPENAL_INCLUDE_DIR "${EMSCRIPTEN_ROOT_PATH}/system/include/AL")
-
-	# Returning "-lopenal" is now considered mandatory
-	SET(OPENAL_LIBRARY "-lopenal")
-	SET(OPENAL_LIB "-lopenal")
-
-	set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${EMSCRIPTEN_ROOT_PATH}/system/include" "${EMSCRIPTEN_ROOT_PATH}/system/include/AL")
-
-	MARK_AS_ADVANCED(OPENAL_LIBRARY OPENAL_INCLUDE_DIR)
-endif()

web-wasi-emulated-threads/FindOpenGL.cmake

@@ -1,34 +0,0 @@
-# Locate OpenGL
-# This module defines:
-# OPENGL_FOUND       - system has OpenGL
-# OPENGL_XMESA_FOUND - system has XMESA
-# OPENGL_GLU_FOUND   - system has GLU
-# OPENGL_INCLUDE_DIR - the GL include directory
-# OPENGL_LIBRARIES   - Link these to use OpenGL and GLU
-# OPENGL_gl_LIBRARY  - Path to OpenGL Library
-# OPENGL_glu_LIBRARY - Path to GLU Library
-
-# The implementation is based on the standard FindOpenGL.cmake provided with CMake,
-# but customized for targeting Emscripten only.
-
-# These libraries are provided with Emscripten
-SET(OPENGL_FOUND TRUE)
-SET(OPENGL_GLU_FOUND TRUE)
-
-# Doesn't look like this one is part of Emscripten
-SET(OPENGL_XMESA_FOUND FALSE)
-
-# This is the path where <GL/gl.h> is found
-SET(OPENGL_INCLUDE_DIR "${EMSCRIPTEN_ROOT_PATH}/system/include")
-
-# No library to link against for OpenGL, since Emscripten picks it up automatically from library_webgl.js,
-# but need to report something, or CMake thinks we failed in the search.
-SET(OPENGL_LIBRARIES "nul")
-SET(OPENGL_gl_LIBRARY "nul")
-SET(OPENGL_glu_LIBRARY "nul")
-
-mark_as_advanced(
-  OPENGL_INCLUDE_DIR
-  OPENGL_glu_LIBRARY
-  OPENGL_gl_LIBRARY
-)

web-wasi-emulated-threads/TestBigEndian.cmake

@@ -1,30 +0,0 @@
-#.rst:
-# TestBigEndian
-# -------------
-#
-# The TestBigEndian.cmake module that ships with CMake, which
-# checks if the system is big endian or little endian, assumes
-# that a binary is produced that will have bytes that correspond to the
-# endianness on the target system. Since emscripten produces Javascript, we
-# override the default behavior and always return little endian.
-#
-# ::
-#
-#   TEST_BIG_ENDIAN(VARIABLE)
-#   VARIABLE - variable to store the result to
-#=============================================================================
-# Copyright 2002-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-function(TEST_BIG_ENDIAN VARIABLE)
-  set(${VARIABLE} 0 CACHE INTERNAL "Result of TEST_BIG_ENDIAN" FORCE)
-endfunction()

web-wasi-emulated-threads/Toolchain.cmake

@@ -1,14 +0,0 @@
-set(WASI_SDK_PREFIX $ENV{WASI_SDK_PATH})
-include($ENV{WASI_SDK_PATH}/share/cmake/wasi-sdk.cmake)
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WASI_EMULATED_PTHREAD")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WASI_EMULATED_PTHREAD")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lwasi-emulated-pthread")
-
-set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
-set(CMAKE_SYSROOT $ENV{WASI_SYSROOT})
-
-set(CMAKE_C_COMPILER /usr/local/bin/clang-wasi-sysroot.sh)
-set(CMAKE_CXX_COMPILER /usr/local/bin/clang++-wasi-sysroot.sh)
-
-set(CMAKE_CROSSCOMPILING_EMULATOR /wasi-runtimes/wasmtime/bin/wasmtime-pwd.sh)

web-wasi-emulated-threads/WASI.cmake

@@ -1,2 +0,0 @@
-set(WASI 1)
-set(UNIX 1)

web-wasi-emulated-threads/clang++-wasi-sysroot.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-exec ${WASI_SDK_PATH}/bin/clang++ -D_WASI_EMULATED_PTHREAD --target=wasm32-wasi --sysroot=${WASI_SYSROOT} "$@"

web-wasi-emulated-threads/clang-wasi-sysroot.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-exec ${WASI_SDK_PATH}/bin/clang -D_WASI_EMULATED_PTHREAD --target=wasm32-wasi --sysroot=${WASI_SYSROOT} "$@"

web-wasi-emulated-threads/download-build-install-wasi-sdk.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-set -eox pipefail
-
-mkdir /tmp/dl
-cd /tmp/dl
-
-wasi_sdk_dir=/opt/wasi-sdk
-mkdir -p $wasi_sdk_dir
-
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-export PATH=$HOME/.cargo/bin:$PATH
-
-git clone --recurse-submodules -b enable-libcxx-threads https://github.com/thewtex/wasi-sdk
-cd wasi-sdk
-git fetch origin --tags
-git remote add upstream https://github.com/WebAssembly/wasi-sdk
-git fetch upstream wasi-sdk-${WASI_VERSION}
-
-./ci/build.sh
-cd build/dist
-tar xzf wasi-toolchain-*.tar.gz --strip-components=1 -C /opt/wasi-sdk
-mkdir -p /opt/wasi-sdk/share/wasi-sysroot
-tar xzf wasi-sysroot-*.tar.gz --strip-components=1 -C /opt/wasi-sdk/share/wasi-sysroot
-for wasi_toolchain in wasi wasip1 wasip2; do
-  libclang_rt_out_dir=/opt/wasi-sdk/lib/clang/${LLVM_VERSION}/${wasi_toolchain}
-  mkdir -p $libclang_rt_out_dir
-  tar xzf ./libclang_rt.builtins-*.tar.gz --strip-components=1 -C $libclang_rt_out_dir
-done
-mkdir -p /opt/wasi-sdk/lib/clang/${LLVM_VERSION}/lib/wasm32-unknown-wasi
-cp ${libclang_rt_out_dir}/libclang_rt.builtins-wasm32.a /opt/wasi-sdk/lib/clang/${LLVM_VERSION}/lib/wasm32-unknown-wasi/libclang_rt.builtins.a
-
-cd /tmp/
-rm -rf /tmp/dl
-rm -rf $HOME/.cargo
-

web-wasi-threads/Dockerfile.in

@@ -1,16 +1,11 @@
 ARG ORG=dockcross
-ARG HOST_ARCH=amd64
+FROM ${ORG}/web-wasi:latest
-FROM ${ORG}/web-wasi:latest-${HOST_ARCH}
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
-
-COPY clang-wasi-threads-sysroot.sh clang++-wasi-threads-sysroot.sh /usr/local/bin/
 
 ENV CROSS_TRIPLE=wasm32-wasi-threads
-ENV CC=clang-wasi-threads-sysroot.sh \
-    CXX=clang++-wasi-threads-sysroot.sh
 
 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"

web-wasi-threads/Toolchain.cmake

@@ -4,7 +4,14 @@ include($ENV{WASI_SDK_PATH}/share/cmake/wasi-sdk-pthread.cmake)
 set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})
 set(CMAKE_SYSROOT $ENV{WASI_SYSROOT})
 
-set(CMAKE_C_COMPILER /usr/local/bin/clang-wasi-threads-sysroot.sh)
+set(CMAKE_C_COMPILER /usr/local/bin/clang-wasi-sysroot.sh)
-set(CMAKE_CXX_COMPILER /usr/local/bin/clang++-wasi-threads-sysroot.sh)
+set(CMAKE_CXX_COMPILER /usr/local/bin/clang++-wasi-sysroot.sh)
+set(CMAKE_AR llvm-ar-$ENV{LLVM_VERSION})
+set(CMAKE_RANLIB llvm-ranlib-$ENV{LLVM_VERSION})
+set(CMAKE_ASM_COMPILER clang-$ENV{LLVM_VERSION})
+
+set(CMAKE_C_COMPILER_TARGET $ENV{CROSS_TRIPLE})
+set(CMAKE_CXX_COMPILER_TARGET $ENV{CROSS_TRIPLE})
+set(CMAKE_ASM_COMPILER_TARGET $ENV{CROSS_TRIPLE})
 
 set(CMAKE_CROSSCOMPILING_EMULATOR /wasi-runtimes/wasmtime/bin/wasmtime-pwd-threads.sh)

web-wasi-threads/clang++-wasi-threads-sysroot.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-exec ${WASI_SDK_PATH}/bin/clang++ -pthread --target=wasm32-wasi-threads --sysroot=${WASI_SYSROOT} "$@"

web-wasi-threads/clang-wasi-threads-sysroot.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-exec ${WASI_SDK_PATH}/bin/clang -pthread --target=wasm32-wasi-threads --sysroot=${WASI_SYSROOT} "$@"

web-wasi/Dockerfile.in

@@ -1,28 +1,46 @@
 ARG ORG=dockcross
-ARG HOST_ARCH=amd64
+FROM ${ORG}/base:latest
-FROM ${ORG}/base:latest-${HOST_ARCH}
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
-ENV LLVM_VERSION=19
+ENV LLVM_VERSION 18
-ENV WASI_VERSION=25
-ENV WASI_VERSION_FULL=${WASI_VERSION}.0
 
-COPY download-install-wasi-sdk.sh /usr/local/bin/
+# Build LLVM / Clang that supports our glibc
-RUN /usr/local/bin/download-install-wasi-sdk.sh
+RUN apt-get update && \
+    # Temporarily install to setup apt repositories
+    apt-get install -y && \
+\
+    curl -sS https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/llvm.gpg && \
+    echo "deb [signed-by=/etc/apt/trusted.gpg.d/llvm.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-${LLVM_VERSION} main" >> /etc/apt/sources.list.d/llvm.list && \
+    echo "deb-src [signed-by=/etc/apt/trusted.gpg.d/llvm.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-${LLVM_VERSION} main" >> /etc/apt/sources.list.d/llvm.list && \
+\
+    apt-get update && \
+    apt-get install -y clang-${LLVM_VERSION} lld-${LLVM_VERSION} && \
+    rm -rf /var/lib/apt/lists/*
 
-ENV WASI_SYSROOT=/opt/wasi-sdk/share/wasi-sysroot
+ENV WASI_VERSION 22
-ENV WASI_SDK_PATH=/opt/wasi-sdk
+ENV WASI_VERSION_FULL ${WASI_VERSION}.0
+RUN cd /usr/ && \
+  curl -L -O https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz && \
+  tar xvzf wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz && \
+  rm wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz
+RUN cd /usr/ && \
+  curl -L -O https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/libclang_rt.builtins-wasm32-wasi-${WASI_VERSION_FULL}.tar.gz && \
+  tar xvzf libclang_rt.builtins-wasm32-wasi-${WASI_VERSION_FULL}.tar.gz && \
+  rm libclang_rt.builtins-wasm32-wasi-${WASI_VERSION_FULL}.tar.gz && \
+  cp -r lib/wasi /usr/lib/llvm-${LLVM_VERSION}/lib/clang/${LLVM_VERSION}/lib/
+ENV WASI_SYSROOT /usr/wasi-sdk-${WASI_VERSION_FULL}/share/wasi-sysroot
+ENV WASI_SDK_PATH /usr/wasi-sdk-${WASI_VERSION_FULL}
 
 COPY clang-wasi-sysroot.sh clang++-wasi-sysroot.sh /usr/local/bin/
 
 ENV CROSS_TRIPLE=wasm32-wasi
 ENV CROSS_ROOT=${WASI_SDK_PATH}
-ENV AR=${WASI_SDK_PATH}/bin/llvm-ar \
+ENV AR=llvm-ar-${LLVM_VERSION} \
     CC=clang-wasi-sysroot.sh \
     CXX=clang++-wasi-sysroot.sh \
-    LD=${WASI_SDK_PATH}/bin/wasm-ld \
+    LD=wasm-ld-${LLVM_VERSION} \
-    RANLIB=${WASI_SDK_PATH}/bin/llvm-ranlib
+    RANLIB=llvm-ranlib-${LLVM_VERSION}
 
 #include "common.webassembly"
 
@@ -33,6 +51,6 @@ RUN mv /usr/src/*.cmake /usr/share/cmake-*/Modules/
 COPY CheckTypeSize.c.in /usr/src/
 RUN mv /usr/src/CheckTypeSize.c.in /usr/share/cmake-*/Modules/
 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"

web-wasi/Toolchain.cmake

@@ -6,5 +6,12 @@ set(CMAKE_SYSROOT $ENV{WASI_SYSROOT})
 
 set(CMAKE_C_COMPILER /usr/local/bin/clang-wasi-sysroot.sh)
 set(CMAKE_CXX_COMPILER /usr/local/bin/clang++-wasi-sysroot.sh)
+set(CMAKE_AR llvm-ar-$ENV{LLVM_VERSION})
+set(CMAKE_RANLIB llvm-ranlib-$ENV{LLVM_VERSION})
+set(CMAKE_ASM_COMPILER clang-$ENV{LLVM_VERSION})
+
+set(CMAKE_C_COMPILER_TARGET $ENV{CROSS_TRIPLE})
+set(CMAKE_CXX_COMPILER_TARGET $ENV{CROSS_TRIPLE})
+set(CMAKE_ASM_COMPILER_TARGET $ENV{CROSS_TRIPLE})
 
 set(CMAKE_CROSSCOMPILING_EMULATOR /wasi-runtimes/wasmtime/bin/wasmtime-pwd.sh)

web-wasi/clang++-wasi-sysroot.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-exec ${WASI_SDK_PATH}/bin/clang++ --target=wasm32-wasi --sysroot=${WASI_SYSROOT} "$@"
+exec clang++-${LLVM_VERSION} --target=wasm32-wasi --sysroot=${WASI_SYSROOT} "$@"

web-wasi/clang-wasi-sysroot.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-exec ${WASI_SDK_PATH}/bin/clang --target=wasm32-wasi --sysroot=${WASI_SYSROOT} "$@"
+exec clang-${LLVM_VERSION} --target=wasm32-wasi --sysroot=${WASI_SYSROOT} "$@"

web-wasi/download-install-wasi-sdk.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -eox pipefail
-
-mkdir /tmp/dl
-cd /tmp/dl
-
-curl -L -O https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-arm64-linux.deb && \
-curl -L -O https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-x86_64-linux.deb && \
-
-case `dpkg --print-architecture` in
-    amd64) dpkg -i wasi-sdk-*-x86_64-linux.deb ;;
-    arm64) dpkg -i wasi-sdk-*-arm64-linux.deb ;;
-    *) exit 1 ;;
-esac
-
-cd /tmp/
-rm -rf /tmp/dl

web-wasm/Dockerfile.in

@@ -1,8 +1,7 @@
-ARG DOCKER_IMAGE_VERSION=3.1.74
+ARG DOCKER_IMAGE_VERSION=3.1.60
-ARG HOST_ARCH_TAG
+FROM emscripten/emsdk:$DOCKER_IMAGE_VERSION
-FROM emscripten/emsdk:$DOCKER_IMAGE_VERSION$HOST_ARCH_TAG
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 # Revert back to "/bin/sh" as default shell
 # See https://github.com/asRIA/emscripten-docker/blob/master/Dockerfile.in#L4
@@ -58,15 +57,15 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
 
 #include "common.webassembly"
 
-ENV EMSCRIPTEN_VERSION=$DOCKER_IMAGE_VERSION
+ENV EMSCRIPTEN_VERSION $DOCKER_IMAGE_VERSION
 
-ENV PATH=/emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
+ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
 ENV CC=/emsdk/upstream/emscripten/emcc \
   CXX=/emsdk/upstream/emscripten/em++ \
   AR=/emsdk/upstream/emscripten/emar
 
 RUN chmod -R 777 /emsdk/upstream/emscripten/cache
 
-ENV CMAKE_TOOLCHAIN_FILE=/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
+ENV CMAKE_TOOLCHAIN_FILE /emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
 
 #include "common.label-and-env"

windows-arm64/Dockerfile.in

@@ -1,7 +1,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV XCC_PREFIX /usr/xcc
 ENV CROSS_TRIPLE aarch64-w64-mingw32

windows-armv7/Dockerfile.in

@@ -1,7 +1,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV XCC_PREFIX /usr/xcc
 ENV CROSS_TRIPLE armv7-w64-mingw32

windows-shared-x64-posix/Dockerfile.in

@@ -1,7 +1,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV WINEARCH win64
 ARG MXE_TARGET_ARCH=x86_64

windows-shared-x64/Dockerfile.in

@@ -1,7 +1,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV WINEARCH win64
 ARG MXE_TARGET_ARCH=x86_64

windows-shared-x86/Dockerfile.in

@@ -1,7 +1,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV WINEARCH win32
 ARG MXE_TARGET_ARCH=i686

windows-static-x64-posix/Dockerfile.in

@@ -1,7 +1,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV WINEARCH win64
 ARG MXE_TARGET_ARCH=x86_64

windows-static-x64/Dockerfile.in

@@ -1,7 +1,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV WINEARCH win64
 ARG MXE_TARGET_ARCH=x86_64

windows-static-x86/Dockerfile.in

@@ -1,7 +1,7 @@
 ARG ORG=dockcross
 FROM ${ORG}/base:latest
 
-LABEL maintainer="Matt McCormick matt@mmmccormick.com"
+LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
 ENV WINEARCH win32
 ARG MXE_TARGET_ARCH=i686