Revert "Commit to reverse before PR"

This reverts commit f2fa6d69ca.

.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
-            docker save dockcross/base:latest | xz -e9 -T0 > ./cache/base.tar.xz
+          mkdir -p cache
+          docker save dockcross/base:latest | xz -e9 -T0 > ./cache/base.tar.xz
       - name: save base
         uses: actions/upload-artifact@v2
         with:
@@ -36,26 +36,386 @@ jobs:
       - 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
+          docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
+          docker image push dockcross/base --all-tags
 
   image:
-    name: ${{ matrix.arch_name }}
+    name: ${{ matrix.arch_name.image }}
     needs: base
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, 
-          linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, 
-          linux-armv6, linux-armv6-lts, linux-armv6-musl, linux-arm64-full, 
-          linux-armv7, linux-armv7a, linux-armv7l-musl, 
-          linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-x86_64-full,
-          linux-mips, linux-ppc64le, web-wasm,
-          manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64,
-          windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-armv7,
-          windows-shared-x64, windows-shared-x64-posix, windows-shared-x86, windows-arm64, 
-          linux-riscv64, linux-riscv32, linux-m68k-uclibc, linux-xtensa-uclibc, linux-x64-tinycc]
+        arch_name:
+          # Android images
+          - {
+              image: "android-arm",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=armv7 COMP=ndk",
+              ninja: "no",
+              ninja_arg: "",
+              openssl: "no",
+              openssl_arg: "android-arm",
+            }
+          - {
+              image: "android-arm64",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=armv8 COMP=ndk",
+              ninja: "no",
+              ninja_arg: "",
+              openssl: "no",
+              openssl_arg: "android-arm64",
+            }
+          - {
+              image: "android-x86",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=x86-32 COMP=ndk",
+              ninja: "no",
+              ninja_arg: "",
+              openssl: "no",
+              openssl_arg: "android-x86",
+            }
+          - {
+              image: "android-x86_64",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=x86-64 COMP=ndk",
+              ninja: "no",
+              ninja_arg: "",
+              openssl: "no",
+              openssl_arg: "android-x86_64",
+            }
+          # Linux arm64/armv8 images
+          - {
+              image: "linux-arm64",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=armv8",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-aarch64",
+            }
+          - {
+              image: "linux-arm64-musl",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=armv8",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-aarch64",
+            }
+          - {
+              image: "linux-arm64-full",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=armv8",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-aarch64",
+            }
+          # Linux armv5 images
+          - {
+              image: "linux-armv5",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-armv4",
+            }
+          - {
+              image: "linux-armv5-musl",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-armv4",
+            }
+          # Linux armv6 images
+          - {
+              image: "linux-armv6",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-armv4",
+            }
+          - {
+              image: "linux-armv6-lts",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-armv4",
+            }
+          - {
+              image: "linux-armv6-musl",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-armv4",
+            }
+          # Linux armv7 images
+          - {
+              image: "linux-armv7",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=armv7",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-armv4",
+            }
+          - {
+              image: "linux-armv7a",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=armv7-neon",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-armv4",
+            }
+          - {
+              image: "linux-armv7l-musl",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=armv7",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-armv4",
+            }
+          # 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",
+            }
+          # 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",
+            }
+          - {
+              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",
+            }
+          - {
+              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",
+            }
+          - {
+              image: "linux-x86_64-full",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=x86-64-modern",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-x86_64",
+            }
+          # Linux riscv images
+          - {
+              image: "linux-riscv32",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-generic32",
+            }
+          - {
+              image: "linux-riscv64",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-generic64",
+            }
+          # Linux s390x images
+          - {
+              image: "linux-s390x",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux64-s390x",
+            }
+          # Linux mips images
+          - {
+              image: "linux-mips",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-generic32",
+            }
+          # Linux ppc64le images
+          - {
+              image: "linux-ppc64le",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=ppc-64",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-ppc64le",
+            }
+          # 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",
+            }
+          # 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",
+            }
+          # 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",
+            }
+          - {
+              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",
+            }
+          - {
+              image: "windows-shared-x64",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "no",
+              ninja_arg: "",
+              openssl: "no",
+              openssl_arg: "mingw64 no-asm",
+            }
+          - {
+              image: "windows-shared-x64-posix",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "no",
+              ninja_arg: "",
+              openssl: "no",
+              openssl_arg: "mingw64 no-asm",
+            }
+          # 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",
+            }
+          - {
+              image: "windows-shared-x86",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "no",
+              ninja_arg: "",
+              openssl: "no",
+              openssl_arg: "mingw no-asm",
+            }
+          # 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",
+            }
+          - {
+              image: "windows-arm64",
+              stockfish: "no",
+              stockfish_arg: "ARCH=armv8 COMP=clang",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "no",
+              openssl_arg: "mingw64 no-asm",
+            }
+          # manylinux2014 images
+          - {
+              image: "manylinux2014-x86",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=x86-32-sse41-popcnt",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-x86",
+            }
+          - {
+              image: "manylinux2014-x64",
+              stockfish: "yes",
+              stockfish_arg: "ARCH=x86-64-modern",
+              ninja: "yes",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-x86_64",
+            }
+          - {
+              image: "manylinux2014-aarch64",
+              stockfish: "no",
+              stockfish_arg: "",
+              ninja: "no",
+              ninja_arg: "",
+              openssl: "yes",
+              openssl_arg: "linux-aarch64",
+            }
+          # 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",
+            }
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2
@@ -65,11 +425,35 @@ jobs:
       - name: load base
         run: xz -d -k < ./cache/base.tar.xz | docker load
       - name: build
-        run: make ${{ matrix.arch_name }}
-      - name: test
-        run: make ${{ matrix.arch_name }}.test
+        run: make ${{ matrix.arch_name.image }}
+      - name: basic test
+        run: make ${{ matrix.arch_name.image }}.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
+          ./../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: deploy
         if: github.ref == 'refs/heads/master'
         run: |
-            docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
-            docker image push dockcross/${{ matrix.arch_name }} --all-tags
+          docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
+          docker image push dockcross/${{ matrix.arch_name.image }} --all-tags

android-arm/Dockerfile.in

@@ -9,13 +9,11 @@ RUN apt-get update && apt-get install -y \
 
 ENV CROSS_TRIPLE=arm-linux-androideabi
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
-ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
-    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
-    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
+ENV AS=${CROSS_ROOT}/bin/llvm-as \
+    AR=${CROSS_ROOT}/bin/llvm-ar \
+    CC=${CROSS_ROOT}/bin/clang \
+    CXX=${CROSS_ROOT}/bin/clang++ \
+    LD=${CROSS_ROOT}/bin/ld
 
 ENV ANDROID_NDK_REVISION 23
 ENV ANDROID_NDK_API 23

android-arm64/Dockerfile.in

@@ -13,13 +13,11 @@ RUN apt-get update && apt-get install -y \
 
 ENV CROSS_TRIPLE=aarch64-linux-android
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
-ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
-    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
-    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
+ENV AS=${CROSS_ROOT}/bin/llvm-as \
+    AR=${CROSS_ROOT}/bin/llvm-ar \
+    CC=${CROSS_ROOT}/bin/clang \
+    CXX=${CROSS_ROOT}/bin/clang++ \
+    LD=${CROSS_ROOT}/bin/ld
 
 ENV ANDROID_NDK_REVISION 23
 ENV ANDROID_NDK_API 23

android-x86/Dockerfile

@@ -4,13 +4,11 @@ RUN apt-get update && apt-get install -y unzip
 
 ENV CROSS_TRIPLE=i686-linux-android
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
-ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
-    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
-    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
+ENV AS=${CROSS_ROOT}/bin/llvm-as \
+    AR=${CROSS_ROOT}/bin/llvm-ar \
+    CC=${CROSS_ROOT}/bin/clang \
+    CXX=${CROSS_ROOT}/bin/clang++ \
+    LD=${CROSS_ROOT}/bin/ld
 
 ENV ANDROID_NDK_REVISION 23
 ENV ANDROID_NDK_API 23

android-x86_64/Dockerfile

@@ -4,13 +4,11 @@ RUN apt-get update && apt-get install -y unzip
 
 ENV CROSS_TRIPLE=x86_64-linux-android
 ENV CROSS_ROOT=/usr/${CROSS_TRIPLE}
-ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
-    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
-    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
+ENV AS=${CROSS_ROOT}/bin/llvm-as \
+    AR=${CROSS_ROOT}/bin/llvm-ar \
+    CC=${CROSS_ROOT}/bin/clang \
+    CXX=${CROSS_ROOT}/bin/clang++ \
+    LD=${CROSS_ROOT}/bin/ld
 
 ENV ANDROID_NDK_REVISION 23
 ENV ANDROID_NDK_API 23

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

@@ -0,0 +1,22 @@
+#!/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