Move to llvm for NDK 23

.github/workflows/main.yml

@@ -3,14 +3,14 @@ name: Dockcross CI
 on:
   push:
     branches:
-      - "*"
+    - '*'
     paths-ignore:
-      - "**.md"
+      - '**.md'
   pull_request:
     branches:
-      - "*"
+    - '*'
     paths-ignore:
-      - "**.md"
+      - '**.md'
   workflow_dispatch:
 
 jobs:
@@ -25,8 +25,8 @@ jobs:
         run: make base.test
       - name: archive base
         run: |
-          mkdir -p cache
+            mkdir -p cache
-          docker save dockcross/base:latest | xz -e9 -T0 > ./cache/base.tar.xz
+            docker save dockcross/base:latest | xz -e9 -T0 > ./cache/base.tar.xz
       - name: save base
         uses: actions/upload-artifact@v2
         with:
@@ -36,620 +36,26 @@ jobs:
       - name: deploy
         if: github.ref == 'refs/heads/master'
         run: |
-          docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
+            docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
-          docker image push dockcross/base --all-tags
+            docker image push dockcross/base --all-tags
 
   image:
-    name: ${{ matrix.arch_name.image }}
+    name: ${{ matrix.arch_name }}
     needs: base
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        arch_name:
+        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, 
-          # Android images
+          linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, 
-          - {
+          linux-armv6, linux-armv6-lts, linux-armv6-musl, linux-arm64-full, 
-              image: "android-arm",
+          linux-armv7, linux-armv7a, linux-armv7l-musl, 
-              stockfish: "yes",
+          linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-x86_64-full,
-              stockfish_arg: "ARCH=armv7 COMP=ndk",
+          linux-mips, linux-ppc64le, web-wasm,
-              ninja: "no",
+          manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64,
-              ninja_arg: "",
+          windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-armv7,
-              openssl: "yes",
+          windows-shared-x64, windows-shared-x64-posix, windows-shared-x86, windows-arm64, 
-              openssl_arg: "android-arm no-shared",
+          linux-riscv64, linux-riscv32, linux-m68k-uclibc, linux-xtensa-uclibc, linux-x64-tinycc]
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "no",
-              fmt_arg: ""
-            }
-          - {
-              image: "android-arm64",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=armv8 COMP=ndk",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "android-arm64 no-shared",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "no",
-              fmt_arg: ""
-            }
-          - {
-              image: "android-x86",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=x86-32 COMP=ndk",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "android-x86 no-shared",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "no",
-              fmt_arg: ""
-            }
-          - {
-              image: "android-x86_64",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=x86-64 COMP=ndk",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "android-x86_64 no-shared",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "no",
-              fmt_arg: ""
-            }
-          # Linux arm64/armv8 images
-          - {
-              image: "linux-arm64",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=armv8",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-aarch64",
-              C: "yes",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "linux-arm64-musl",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=armv8",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-aarch64",
-              C: "yes",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "linux-arm64-full",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=armv8",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-aarch64",
-              C: "yes",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          # Linux armv5 images
-          - {
-              image: "linux-armv5",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-armv4",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "linux-armv5-musl",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-armv4",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          # Linux armv6 images
-          - {
-              image: "linux-armv6",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-armv4",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "linux-armv6-lts",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-armv4",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "linux-armv6-musl",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-armv4",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          # Linux armv7 images
-          - {
-              image: "linux-armv7",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=armv7",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-armv4",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "linux-armv7a",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=armv7-neon",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-armv4",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "linux-armv7l-musl",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=armv7",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-armv4",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          # Linux x86 images
-          - {
-              image: "linux-x86",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=x86-32-sse41-popcnt",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-x86",
-              C: "yes",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          # Linux x86_64 images
-          - {
-              image: "linux-x64",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=x86-64-modern",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-x86_64",
-              C: "yes",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "linux-x64-tinycc",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=x86-64-modern",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "linux-x64-clang",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=x86-64-modern COMP=clang",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "linux-x86_64-clang",
-              C: "yes",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "linux-x86_64-full",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=x86-64-modern",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-x86_64",
-              C: "yes",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          # Linux riscv images
-          - {
-              image: "linux-riscv32",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-generic32",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "linux-riscv64",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-generic64",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          # Linux s390x images
-          - {
-              image: "linux-s390x",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux64-s390x",
-              C: "yes",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          # Linux mips images
-          - {
-              image: "linux-mips",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-generic32",
-              C: "yes",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          # Linux ppc64le images
-          - {
-              image: "linux-ppc64le",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=ppc-64",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-ppc64le",
-              C: "yes",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          # Linux m68k images
-          - {
-              image: "linux-m68k-uclibc",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "linux-generic32 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "no",
-              fmt_arg: ""
-            }
-          # Linux xtensa images
-          - {
-              image: "linux-xtensa-uclibc",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "no",
-              fmt_arg: ""
-            }
-          # Windows x86_x64 images
-          - {
-              image: "windows-static-x64",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=x86-64-modern COMP=mingw",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "mingw64 no-asm",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "windows-static-x64-posix",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=x86-64-modern COMP=mingw",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "mingw64 no-asm",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "windows-shared-x64",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "mingw64 no-asm",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "windows-shared-x64-posix",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "mingw64 no-asm",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          # Windows x86 images
-          - {
-              image: "windows-static-x86",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=x86-32-sse41-popcnt COMP=mingw",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "mingw no-asm",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "windows-shared-x86",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "mingw no-asm",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
-              fmt: "no",
-              fmt_arg: ""
-            }
-          # Windows arm images
-          - {
-              image: "windows-armv7",
-              stockfish: "no",
-              stockfish_arg: "ARCH=armv7-neon COMP=clang",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "mingw no-asm",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "windows-arm64",
-              stockfish: "no",
-              stockfish_arg: "ARCH=armv8 COMP=clang",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "mingw64 no-asm",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "yes",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          # manylinux2014 images
-          - {
-              image: "manylinux2014-x86",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=x86-32-sse41-popcnt",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-x86",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "manylinux2014-x64",
-              stockfish: "yes",
-              stockfish_arg: "ARCH=x86-64-modern",
-              ninja: "yes",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-x86_64",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
-              fmt: "yes",
-              fmt_arg: ""
-            }
-          - {
-              image: "manylinux2014-aarch64",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "yes",
-              openssl_arg: "linux-aarch64",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
-              fmt: "no",
-              fmt_arg: ""
-            }
-          # web-wasm images
-          - {
-              image: "web-wasm",
-              stockfish: "no",
-              stockfish_arg: "",
-              ninja: "no",
-              ninja_arg: "",
-              openssl: "no",
-              openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
-              C: "no",
-              C_arg: "",
-              C-Plus-Plus: "no",
-              C-Plus-Plus_arg: "",
-              fmt: "no",
-              fmt_arg: ""
-            }
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2
@@ -659,63 +65,11 @@ jobs:
       - name: load base
         run: xz -d -k < ./cache/base.tar.xz | docker load
       - name: build
-        run: make ${{ matrix.arch_name.image }}
+        run: make ${{ matrix.arch_name }}
-      - name: basic test
+      - name: test
-        run: make ${{ matrix.arch_name.image }}.test
+        run: make ${{ matrix.arch_name }}.test
-      - name: stockfish build test
-        if: ${{ matrix.arch_name.stockfish == 'yes' }}
-        run: |
-          git clone --depth 1 --branch sf_14 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 }} -j2
-          cd ../..
-          rm -rf Stockfish
-      - name: ninja build test
-        if: ${{ matrix.arch_name.ninja == 'yes' }}
-        run: |
-          git clone --depth 1 --branch v1.10.2 https://github.com/ninja-build/ninja.git
-          cd ninja
-          ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.ninja_arg }}
-      - name: openssl build test
-        if: ${{ matrix.arch_name.openssl == 'yes' }}
-        run: |
-          git clone --depth 1 --branch OpenSSL_1_1_1k 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 }} -j2
-          cd ..
-          rm -rf openssl
-      - name: C build test
-        if: ${{ matrix.arch_name.C == 'yes' }}
-        run: |
-          git clone https://github.com/TheAlgorithms/C.git
-          cd C
-          git checkout cc241f58c253c533ac94e07151ef91a5ef7e5719
-          ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C_arg }}
-          cd ..
-          rm -rf C
-      - name: C-Plus-Plus build test
-        if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' }}
-        run: |
-          git clone https://github.com/TheAlgorithms/C-Plus-Plus.git
-          cd C-Plus-Plus
-          git checkout c3b07aed2240e5364e1a49d091a00b61f520e653
-          ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
-          cd ..
-          rm -rf C-Plus-Plus
-      - name: fmt build test
-        if: ${{ matrix.arch_name.fmt == 'yes' }}
-        run: |
-          git clone --depth 1 --branch 8.0.1 https://github.com/fmtlib/fmt.git
-          cd fmt
-          ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.fmt_arg }} -DFMT_DOC=OFF
-          cd ..
-          rm -rf fmt
       - name: deploy
         if: github.ref == 'refs/heads/master'
         run: |
-          docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
+            docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
-          docker image push dockcross/${{ matrix.arch_name.image }} --all-tags
+            docker image push dockcross/${{ matrix.arch_name }} --all-tags

android-arm/Dockerfile.in

@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y \
 
 ENV CROSS_TRIPLE=arm-linux-androideabi
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
-ENV ANDROID_NDK=${CROSS_ROOT}
 ENV AS=${CROSS_ROOT}/bin/llvm-as \
     AR=${CROSS_ROOT}/bin/llvm-ar \
     CC=${CROSS_ROOT}/bin/clang \

android-arm64/Dockerfile.in

@@ -13,7 +13,6 @@ RUN apt-get update && apt-get install -y \
 
 ENV CROSS_TRIPLE=aarch64-linux-android
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
-ENV ANDROID_NDK=${CROSS_ROOT}
 ENV AS=${CROSS_ROOT}/bin/llvm-as \
     AR=${CROSS_ROOT}/bin/llvm-ar \
     CC=${CROSS_ROOT}/bin/clang \

android-x86/Dockerfile

@@ -4,7 +4,6 @@ RUN apt-get update && apt-get install -y unzip
 
 ENV CROSS_TRIPLE=i686-linux-android
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
-ENV ANDROID_NDK=${CROSS_ROOT}
 ENV AS=${CROSS_ROOT}/bin/llvm-as \
     AR=${CROSS_ROOT}/bin/llvm-ar \
     CC=${CROSS_ROOT}/bin/clang \

android-x86_64/Dockerfile

@@ -4,7 +4,6 @@ RUN apt-get update && apt-get install -y unzip
 
 ENV CROSS_TRIPLE=x86_64-linux-android
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
-ENV ANDROID_NDK=${CROSS_ROOT}
 ENV AS=${CROSS_ROOT}/bin/llvm-as \
     AR=${CROSS_ROOT}/bin/llvm-ar \
     CC=${CROSS_ROOT}/bin/clang \

imagefiles/build-and-install-openssh.sh

@@ -2,7 +2,7 @@
 
 set -ex
 
-OPENSSH_ROOT=V_8_7_P1
+OPENSSH_ROOT=V_8_5_P1
 
 cd /usr/src
 curl --connect-timeout 20 \

imagefiles/build-and-install-openssl.sh

@@ -47,9 +47,9 @@ source $MY_DIR/utils.sh
 # copied from https://github.com/pypa/manylinux/tree/master/docker/build_scripts
 #
 
-OPENSSL_ROOT=openssl-1.1.1l
+OPENSSL_ROOT=openssl-1.1.1k
-# Hash from https://www.openssl.org/source/openssl-1.1.1l.tar.gz.sha256
+# Hash from https://www.openssl.org/source/openssl-1.1.1k.tar.gz.sha256
-OPENSSL_HASH=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
+OPENSSL_HASH=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5
 OPENSSL_DOWNLOAD_URL=http://www.openssl.org/source/
 
 # a recent enough perl is needed to build openssl

linux-arm64-full/Dockerfile.in

@@ -3,8 +3,8 @@ FROM dockcross/base:latest
 # This is for 64-bit ARM Linux machine
 
 # Buildroot version
-# buildroot master 2021-08-30
+# crosstool-ng master 2021-08-21
-ENV BR_VERSION 2990d7dcb163a5618100a6985726b6820457a6d1
+ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01
 
 #include "common.buildroot"
 

linux-arm64-full/buildroot.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2021.08-rc2-75-g2990d7dcb1 Configuration
+# Buildroot 2021.08-rc2-29-gdbe3af5532 Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_HOST_GCC_AT_LEAST_4_9=y
@@ -186,7 +186,6 @@ BR2_SSP_NONE=y
 BR2_RELRO_NONE=y
 # BR2_RELRO_PARTIAL is not set
 # BR2_RELRO_FULL is not set
-BR2_FORTIFY_SOURCE_ARCH_SUPPORTS=y
 BR2_FORTIFY_SOURCE_NONE=y
 # BR2_FORTIFY_SOURCE_1 is not set
 # BR2_FORTIFY_SOURCE_2 is not set
@@ -962,10 +961,6 @@ BR2_PACKAGE_SDL2=y
 # KMS/DRM video driver needs libdrm
 #
 
-#
-# KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d
-#
-
 #
 # OpenGL support needs X11 and an OpenGL provider
 #
@@ -2204,7 +2199,7 @@ BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y
 BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LAPACK is not set
 BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y
-BR2_PACKAGE_LIBABSEIL_CPP=y
+# BR2_PACKAGE_LIBABSEIL_CPP is not set
 # BR2_PACKAGE_LIBARGTABLE2 is not set
 BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LIBATOMIC_OPS is not set
@@ -2311,7 +2306,7 @@ BR2_PACKAGE_PROTOBUF=y
 #
 # BR2_PACKAGE_AUGEAS is not set
 # BR2_PACKAGE_ENCHANT is not set
-BR2_PACKAGE_FMT=y
+# BR2_PACKAGE_FMT is not set
 # BR2_PACKAGE_FSTRCMP is not set
 # BR2_PACKAGE_ICU is not set
 # BR2_PACKAGE_INIH is not set

linux-x86_64-full/Dockerfile.in

@@ -3,8 +3,8 @@ FROM dockcross/base:latest
 # This is for 64-bit x86 Linux machine
 
 # Buildroot version
-# buildroot master 2021-08-30
+# crosstool-ng master 2021-08-21
-ENV BR_VERSION 2990d7dcb163a5618100a6985726b6820457a6d1
+ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01
 
 #include "common.buildroot"
 

linux-x86_64-full/buildroot.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2021.08-rc2-75-g2990d7dcb1 Configuration
+# Buildroot 2021.08-rc2-29-gdbe3af5532 Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_HOST_GCC_AT_LEAST_4_9=y
@@ -147,7 +147,6 @@ BR2_SSP_NONE=y
 BR2_RELRO_NONE=y
 # BR2_RELRO_PARTIAL is not set
 # BR2_RELRO_FULL is not set
-BR2_FORTIFY_SOURCE_ARCH_SUPPORTS=y
 BR2_FORTIFY_SOURCE_NONE=y
 # BR2_FORTIFY_SOURCE_1 is not set
 # BR2_FORTIFY_SOURCE_2 is not set
@@ -932,10 +931,6 @@ BR2_PACKAGE_SDL2=y
 # KMS/DRM video driver needs libdrm
 #
 
-#
-# KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d
-#
-
 #
 # OpenGL support needs X11 and an OpenGL provider
 #
@@ -2181,7 +2176,7 @@ BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y
 BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LAPACK is not set
 BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y
-BR2_PACKAGE_LIBABSEIL_CPP=y
+# BR2_PACKAGE_LIBABSEIL_CPP is not set
 # BR2_PACKAGE_LIBARGTABLE2 is not set
 BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LIBATOMIC_OPS is not set
@@ -2289,7 +2284,7 @@ BR2_PACKAGE_PROTOBUF=y
 #
 # BR2_PACKAGE_AUGEAS is not set
 # BR2_PACKAGE_ENCHANT is not set
-BR2_PACKAGE_FMT=y
+# BR2_PACKAGE_FMT is not set
 # BR2_PACKAGE_FSTRCMP is not set
 # BR2_PACKAGE_ICU is not set
 # BR2_PACKAGE_INIH is not set

tools/dockcross-cmake-builder.sh

@@ -5,7 +5,7 @@ if (( $# >= 1 )); then
     build_file=build-${image%:*}
     shift 1
 
-    cmake_arg=$@
+    cmake_arg=$*
     echo "cmake arg: $cmake_arg"
 
     #echo "Pulling dockcross/$image"
@@ -16,7 +16,7 @@ if (( $# >= 1 )); then
     chmod +x ./dockcross-"$image"
 
     echo "Build $build_file"
-    ./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja $cmake_arg
+    ./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja "$cmake_arg"
     ./dockcross-"$image" ninja -C "$build_file"
 else
     echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"

tools/dockcross-command.sh

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-if (( $# >= 2 )); then
-    image=$1
-    shift 1
-
-    command=$@
-    echo "command: $command"
-
-    #echo "Pulling dockcross/$image"
-    #docker pull dockcross/"$image"
-
-    echo "Make script dockcross-$image"
-    docker run --rm dockcross/"$image" > ./dockcross-"$image"
-    chmod +x ./dockcross-"$image"
-    
-    echo "Run command in dockcross-$image"
-    ./dockcross-"$image" $command
-else
-    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <command>"
-    exit 1
-fi

tools/dockcross-make-builder.sh

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

web-wasm/Dockerfile.in

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