Enable tests on linux-x64-clang image

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

.github/workflows/main.yml

@@ -62,8 +62,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
-              cpython_arg: "--host=x86_64-linux-gnu --build=arm-linux-androideabi",
+              cpython_arg: "--host=arm-linux-androideabi --target=arm-linux-androideabi",
             }
           - {
               image: "android-arm64",
@@ -79,8 +79,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
-              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-linux-android",
+              cpython_arg: "--host=aarch64-linux-android --target=aarch64-linux-android",
             }
           - {
               image: "android-x86",
@@ -96,8 +96,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
-              cpython_arg: "--host=x86_64-linux-gnu --build=i686-linux-android",
+              cpython_arg: "--host=i686-linux-android --target=i686-linux-android",
             }
           - {
               image: "android-x86_64",
@@ -113,8 +113,8 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "no",
               fmt_arg: "",
-              cpython: "yes",
+              cpython: "no",
-              cpython_arg: "--host=x86_64-linux-gnu --build=x86_64-linux-android",
+              cpython_arg: "--host=x86_64-linux-android --target=x86_64-linux-android",
             }
           # Linux arm64/armv8 images
           - {
@@ -132,7 +132,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
+              cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu",
             }
           - {
               image: "linux-arm64-lts",
@@ -149,7 +149,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
+              cpython_arg: "--host=aarch64-unknown-linux-gnu --target=aarch64-unknown-linux-gnu",
             }
           - {
               image: "linux-arm64-musl",
@@ -166,7 +166,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-linux-musl",
+              cpython_arg: "--host=aarch64-linux-musl --target=aarch64-linux-musl",
             }
           - {
               image: "linux-arm64-full",
@@ -183,7 +183,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=aarch64-unknown-linux-gnu",
+              cpython_arg: "--host=aarch64-buildroot-linux-gnu --target=aarch64-buildroot-linux-gnu",
             }
           # Linux armv5 images
           - {
@@ -201,7 +201,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=armv5-unknown-linux-gnueabi",
+              cpython_arg: "--host=armv5-unknown-linux-gnueabi --target=armv5-unknown-linux-gnueabi",
             }
           - {
               image: "linux-armv5-musl",
@@ -218,7 +218,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=armv5-unknown-linux-musleabi",
+              cpython_arg: "--host=armv5-unknown-linux-musleabi --target=armv5-unknown-linux-musleabi",
             }
           # Linux armv6 images
           - {
@@ -236,7 +236,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=armv6-unknown-linux-gnueabihf",
+              cpython_arg: "--host=armv6-unknown-linux-gnueabihf --target=armv6-unknown-linux-gnueabihf",
             }
           - {
               image: "linux-armv6-lts",
@@ -253,7 +253,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=armv6-unknown-linux-gnueabihf",
+              cpython_arg: "--host=armv6-unknown-linux-gnueabihf --target=armv6-unknown-linux-gnueabihf",
             }
           - {
               image: "linux-armv6-musl",
@@ -270,7 +270,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=armv6-linux-musleabihf",
+              cpython_arg: "--host=armv6-linux-musleabihf --target=armv6-linux-musleabihf",
             }
           # Linux armv7 images
           - {
@@ -288,7 +288,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=armv7-unknown-linux-gnueabi",
+              cpython_arg: "--host=armv7-unknown-linux-gnueabi --target=armv7-unknown-linux-gnueabi",
             }
           - {
               image: "linux-armv7a",
@@ -305,7 +305,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=arm-cortexa8_neon-linux-gnueabihf",
+              cpython_arg: "--host=arm-cortexa8_neon-linux-gnueabihf --target=arm-cortexa8_neon-linux-gnueabihf",
             }
           - {
               image: "linux-armv7l-musl",
@@ -322,7 +322,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=armv7l-linux-musleabihf",
+              cpython_arg: "--host=armv7l-linux-musleabihf --target=armv7l-linux-musleabihf",
             }
           # Linux x86 images
           - {
@@ -383,7 +383,7 @@ jobs:
               stockfish_arg: "ARCH=x86-64-modern COMP=clang",
               ninja: "yes",
               ninja_arg: "",
-              openssl: "no",
+              openssl: "yes",
               openssl_arg: "linux-x86_64-clang",
               C: "yes",
               C_arg: "",
@@ -391,7 +391,7 @@ jobs:
               C-Plus-Plus_arg: "",
               fmt: "yes",
               fmt_arg: "",
-              cpython: "no",
+              cpython: "yes",
               cpython_arg: "",
             }
           - {
@@ -409,7 +409,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=x86_64-buildroot-linux-gnu",
+              cpython_arg: "--host=x86_64-buildroot-linux-gnu --target=x86_64-buildroot-linux-gnu",
             }
           # Linux riscv images
           - {
@@ -427,7 +427,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=riscv32-unknown-linux-gnu",
+              cpython_arg: "--host=riscv32-unknown-linux-gnu --target=riscv32-unknown-linux-gnu",
             }
           - {
               image: "linux-riscv64",
@@ -444,7 +444,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=riscv64-unknown-linux-gnu",
+              cpython_arg: "--host=riscv64-unknown-linux-gnu --target=riscv64-unknown-linux-gnu",
             }
           # Linux s390x images
           - {
@@ -462,7 +462,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=s390x-ibm-linux-gnu",
+              cpython_arg: "--host=s390x-ibm-linux-gnu --target=s390x-ibm-linux-gnu",
             }
           # Linux mips images
           - {
@@ -480,7 +480,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=mips-unknown-linux-gnu",
+              cpython_arg: "--host=mips-unknown-linux-gnu --target=mips-unknown-linux-gnu",
             }
           # Linux ppc64le images
           - {
@@ -498,7 +498,7 @@ jobs:
               fmt: "yes",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=powerpc64le-unknown-linux-gnu",
+              cpython_arg: "--host=powerpc64le-unknown-linux-gnu --target=powerpc64le-unknown-linux-gnu",
             }
           # Linux m68k images
           - {
@@ -516,7 +516,7 @@ jobs:
               fmt: "no",
               fmt_arg: "",
               cpython: "no",
-              cpython_arg: "--host=x86_64-linux-gnu --build=m68k-unknown-uclinux-uclibc",
+              cpython_arg: "--host=m68k-unknown-uclinux-uclibc --target=m68k-unknown-uclinux-uclibc",
             }
           # Linux xtensa images
           - {
@@ -534,7 +534,7 @@ jobs:
               fmt: "no",
               fmt_arg: "",
               cpython: "yes",
-              cpython_arg: "--host=x86_64-linux-gnu --build=xtensa-fsf-linux-uclibc",
+              cpython_arg: "--host=xtensa-fsf-linux-uclibc --target=xtensa-fsf-linux-uclibc",
             }
           # Windows x86_x64 images
           - {
@@ -838,7 +838,7 @@ jobs:
         run: |
           git clone --depth 1 --branch v3.9.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 }}
+          ./../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 --enable-shared
           ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
           cd ..
           rm -rf cpython

common/common.windows

@@ -54,6 +54,7 @@ RUN \
     libc6-dev-i386 \
     lzip \
     make \
+    nsis \
     openssl \
     p7zip-full \
     patch \
@@ -107,12 +108,20 @@ RUN \
   #
   echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} && \
   #
+  # Add a sysmbolic link for makensis
+  #
+  ln -s /usr/bin/makensis /usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-makensis && \
+  #
   # Replace cmake and cpack binaries
   #
   cd /usr/bin && \
   rm cmake cpack && \
   ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cmake cmake && \
-  ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cpack cpack
+  ln -s /usr/src/mxe/usr/bin/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}-cpack cpack && \
+  #
+  # clean up temporary wine files
+  #
+  rm -rf /tmp/wine-*
 
 ENV PATH ${PATH}:/usr/src/mxe/usr/bin
 ENV CROSS_TRIPLE ${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}

linux-armv5-musl/Dockerfile.in

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

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 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} liblld-${CLANG_VERSION}-dev \
-    && 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 -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 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  \
+ENV CC=/usr/bin/clang-${CLANG_VERSION}  \
-    CPP=/usr/bin/cpp \
+    CPP=/usr/bin/clang-cpp-${CLANG_VERSION} \
-    CXX=/usr/bin/clang++  \
+    CXX=/usr/bin/clang++-${CLANG_VERSION} \
-    LD=/usr/bin/lld \
+    LD=/usr/bin/lld-${CLANG_VERSION} \
-    FC=/usr/bin/flang
+    AS=/usr/bin/llvm-as-${CLANG_VERSION} \
-
+    AR=/usr/bin/llvm-ar-${CLANG_VERSION}
-#    AS=/usr/bin/${CROSS_TRIPLE}-as
+#    FC=/usr/bin/flang
-#    AR=/usr/bin/${CROSS_TRIPLE}-ar
 
 COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
 

tools/dockcross-cmake-builder.sh

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

tools/dockcross-command.sh

@@ -1,14 +1,16 @@
 #!/usr/bin/env bash
 
 if (( $# >= 2 )); then
-    image=$1
+    image_complet=$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"
+#    docker pull "dockcross/$image:$tag"
 
     echo "Make script dockcross-$image"
     docker run --rm dockcross/"$image" > ./dockcross-"$image"

tools/dockcross-make-builder.sh

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

web-wasi/Dockerfile.in

@@ -26,6 +26,8 @@ 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,5 +1,4 @@
-set(WASI 1)
+set(WASI_SDK_PREFIX $ENV{WASI_SDK_PATH})
-
 include($ENV{WASI_SDK_PATH}/share/cmake/wasi-sdk.cmake)
 
 set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT})

web-wasi/WASI.cmake

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