Merge branch 'master' into update_label

.github/workflows/main.yml

@@ -366,8 +366,8 @@ jobs:
               stockfish_arg: "ARCH=x86-64-modern",
               ninja: "yes",
               ninja_arg: "",
-              openssl: "yes",
+              openssl: "no",
-              openssl_arg: "linux-generic64 no-tests no-asm no-hw no-dtls no-shared no-dso",
+              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",

linux-armv5-musl/Dockerfile.in

@@ -1,6 +1,5 @@
 FROM dockcross/base:latest
-
+MAINTAINER Matt McCormick "matt.mccormick@kitware.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).

tools/dockcross-cmake-builder.sh

@@ -1,17 +1,15 @@
 #!/usr/bin/env bash
 
 if (( $# >= 1 )); then
-    image_complet=$1
+    image=$1
-    image=${image_complet%:*}
+    build_file=build-${image%:*}
-    tag=${image_complet#*:}
-    build_file=build-$image
     shift 1
 
-    cmake_arg=$*
+    cmake_arg=$@
     echo "cmake arg: $cmake_arg"
 
-#    echo "Pulling dockcross/$image"
+    #echo "Pulling dockcross/$image"
-#    docker pull "dockcross/$image:$tag"
+    #docker pull dockcross/"$image"
 
     echo "Make script dockcross-$image"
     docker run --rm dockcross/"$image" > ./dockcross-"$image"
@@ -21,6 +19,6 @@ if (( $# >= 1 )); then
     ./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja $cmake_arg
     ./dockcross-"$image" ninja -C "$build_file"
 else
-    echo "Usage: ${0##*/} <docker image (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"
+    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"
     exit 1
 fi

tools/dockcross-command.sh

@@ -1,16 +1,14 @@
 #!/usr/bin/env bash
 
 if (( $# >= 2 )); then
-    image_complet=$1
+    image=$1
-    image=${image_complet%:*}
-    tag=${image_complet#*:}
     shift 1
 
-    command=$*
+    command=$@
     echo "command: $command"
 
-#    echo "Pulling dockcross/$image"
+    #echo "Pulling dockcross/$image"
-#    docker pull "dockcross/$image:$tag"
+    #docker pull dockcross/"$image"
 
     echo "Make script dockcross-$image"
     docker run --rm dockcross/"$image" > ./dockcross-"$image"

tools/dockcross-make-builder.sh

@@ -1,17 +1,15 @@
 #!/usr/bin/env bash
 
 if (( $# >= 1 )); then
-    image_complet=$1
+    image=$1
-    image=${image_complet%:*}
+    build_file=build-${image%:*}
-    tag=${image_complet#*:}
-    build_file=build-$image
     shift 1
 
-    make_arg=$*
+    make_arg=$@
     echo "make arg: $make_arg"
 
-#    echo "Pulling dockcross/$image"
+    #echo "Pulling dockcross/$image"
-#    docker pull "dockcross/$image:$tag"
+    #docker pull dockcross/"$image"
 
     echo "Make script dockcross-$image"
     docker run --rm dockcross/"$image" > ./dockcross-"$image"
@@ -20,6 +18,6 @@ if (( $# >= 1 )); then
     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"
 else
-    echo "Usage: ${0##*/} <docker image (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
+    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
     exit 1
 fi

web-wasi/Dockerfile.in

@@ -26,8 +26,6 @@ ENV AR=${CROSS_ROOT}/bin/llvm-ar \
     CXX=clang++-wasi-sysroot.sh \
     LD=${CROSS_ROOT}/bin/wasm-ld
 
-COPY WASI.cmake /usr/src/
-RUN mv /usr/src/WASI.cmake /usr/share/cmake-*/Modules/Platform/
 COPY Toolchain.cmake ${CROSS_ROOT}/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
 

web-wasi/Toolchain.cmake

@@ -1,4 +1,5 @@
-set(WASI_SDK_PREFIX $ENV{WASI_SDK_PATH})
+set(WASI 1)
+
 include($ENV{WASI_SDK_PATH}/share/cmake/wasi-sdk.cmake)
 
 set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})

web-wasi/WASI.cmake

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