Merge branch 'master' into update_label

2025-07-25 11:12:23 +02:00 · 2021-10-13 14:22:36 +02:00
9 changed files with 31 additions and 41 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -383,7 +383,7 @@ jobs:
              stockfish_arg: "ARCH=x86-64-modern COMP=clang",
              ninja: "yes",
              ninja_arg: "",
-              openssl: "yes",
+              openssl: "no",
              openssl_arg: "linux-x86_64-clang",
              C: "yes",
              C_arg: "",
@@ -391,7 +391,7 @@ jobs:
              C-Plus-Plus_arg: "",
              fmt: "yes",
              fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
              cpython_arg: "",
            }
          - {
--- a/linux-armv5-musl/Dockerfile.in
+++ b/linux-armv5-musl/Dockerfile.in
@@ -1,6 +1,5 @@
 FROM dockcross/base:latest
-
-LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
 # VFP instructions (armhf).
--- a/linux-x64-clang/Dockerfile.in
+++ b/linux-x64-clang/Dockerfile.in
@@ -11,8 +11,8 @@ RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /et
    && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION}  main" >> /etc/apt/sources.list \
    && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
    && apt-get update \
-    && apt-get -y install clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev clang-format-${CLANG_VERSION} clang-tidy-${CLANG_VERSION} lldb-${CLANG_VERSION} liblld-${CLANG_VERSION}-dev \
-    && apt-get -y install libomp-${CLANG_VERSION}-dev clang-tools-${CLANG_VERSION} clangd-${CLANG_VERSION} libclang-${CLANG_VERSION}-dev libclang-common-${CLANG_VERSION}-dev llvm-${CLANG_VERSION}-dev \
+    && apt-get purge --autoremove -y gcc g++ software-properties-common \
+    && apt-get -y install clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev clang-format-${CLANG_VERSION} clang-tidy-${CLANG_VERSION} lldb-${CLANG_VERSION}  \
    && apt-get clean --yes \
    && rm -rf /var/lib/apt/lists/* \
    && update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 90 \
@@ -20,20 +20,20 @@ RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /et
    && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++-${CLANG_VERSION} 90 \
    && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 90 \
    && update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION} 90 \
-    && update-alternatives --install /usr/bin/lld lld /usr/bin/lld-${CLANG_VERSION} 90 \
    && cc --version \
    && c++ --version \
    && cpp --version

 ENV CROSS_TRIPLE x86_64-linux-gnu
 ENV CROSS_ROOT /usr/bin
-ENV CC=/usr/bin/clang-${CLANG_VERSION}  \
-    CPP=/usr/bin/clang-cpp-${CLANG_VERSION} \
-    CXX=/usr/bin/clang++-${CLANG_VERSION} \
-    LD=/usr/bin/lld-${CLANG_VERSION} \
-    AS=/usr/bin/llvm-as-${CLANG_VERSION} \
-    AR=/usr/bin/llvm-ar-${CLANG_VERSION}
-#    FC=/usr/bin/flang
+ENV CC=/usr/bin/clang  \
+    CPP=/usr/bin/cpp \
+    CXX=/usr/bin/clang++  \
+    LD=/usr/bin/lld \
+    FC=/usr/bin/flang
+
+#    AS=/usr/bin/${CROSS_TRIPLE}-as
+#    AR=/usr/bin/${CROSS_TRIPLE}-ar

 COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop

--- a/tools/dockcross-cmake-builder.sh
+++ b/tools/dockcross-cmake-builder.sh
@@ -1,17 +1,15 @@
 #!/usr/bin/env bash

 if (( $# >= 1 )); then
-    image_complet=$1
-    image=${image_complet%:*}
-    tag=${image_complet#*:}
-    build_file=build-$image
+    image=$1
+    build_file=build-${image%:*}
    shift 1

-    cmake_arg=$*
+    cmake_arg=$@
    echo "cmake arg: $cmake_arg"

-#    echo "Pulling dockcross/$image"
-#    docker pull "dockcross/$image:$tag"
+    #echo "Pulling dockcross/$image"
+    #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
--- a/tools/dockcross-command.sh
+++ b/tools/dockcross-command.sh
@@ -1,16 +1,14 @@
 #!/usr/bin/env bash

 if (( $# >= 2 )); then
-    image_complet=$1
-    image=${image_complet%:*}
-    tag=${image_complet#*:}
+    image=$1
    shift 1

-    command=$*
+    command=$@
    echo "command: $command"

-#    echo "Pulling dockcross/$image"
-#    docker pull "dockcross/$image:$tag"
+    #echo "Pulling dockcross/$image"
+    #docker pull dockcross/"$image"

    echo "Make script dockcross-$image"
    docker run --rm dockcross/"$image" > ./dockcross-"$image"
--- a/tools/dockcross-make-builder.sh
+++ b/tools/dockcross-make-builder.sh
@@ -1,17 +1,15 @@
 #!/usr/bin/env bash

 if (( $# >= 1 )); then
-    image_complet=$1
-    image=${image_complet%:*}
-    tag=${image_complet#*:}
-    build_file=build-$image
+    image=$1
+    build_file=build-${image%:*}
    shift 1

-    make_arg=$*
+    make_arg=$@
    echo "make arg: $make_arg"

-#    echo "Pulling dockcross/$image"
-#    docker pull "dockcross/$image:$tag"
+    #echo "Pulling dockcross/$image"
+    #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
--- a/web-wasi/Dockerfile.in
+++ b/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

--- a/web-wasi/Toolchain.cmake
+++ b/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})
--- a/web-wasi/WASI.cmake
+++ b/web-wasi/WASI.cmake
@@ -1,2 +0,0 @@
-set(WASI 1)
-set(UNIX 1)