Update linux-x64-tinycc and enable openSSL test

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
Merge pull request #620 from thewtex/wasi-cmake-platform
2025-10-30 23:56:23 +01:00 · 2021-10-17 14:31:34 +02:00 · 2021-10-14 20:52:56 -04:00 · 2021-10-14 13:54:55 -04:00 · 2021-10-13 23:47:29 -04:00 · 2021-10-13 15:41:28 -04:00
24 changed files with 56 additions and 37 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -366,8 +366,8 @@ jobs:
              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",
+              openssl: "yes",
+              openssl_arg: "linux-generic64 no-tests no-asm no-hw no-dtls no-shared no-dso",
              C: "no",
              C_arg: "",
              C-Plus-Plus: "yes",
--- a/common/common.windows
+++ b/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}
--- a/linux-arm64-lts/crosstool-ng.config
+++ b/linux-arm64-lts/crosstool-ng.config
@@ -759,7 +759,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-arm64/crosstool-ng.config
+++ b/linux-arm64/crosstool-ng.config
@@ -757,7 +757,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-armv5-musl/Dockerfile.in
+++ b/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).
--- a/linux-armv5-musl/crosstool-ng.config
+++ b/linux-armv5-musl/crosstool-ng.config
@@ -766,7 +766,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-armv5/crosstool-ng.config
+++ b/linux-armv5/crosstool-ng.config
@@ -771,7 +771,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-armv6-lts/crosstool-ng.config
+++ b/linux-armv6-lts/crosstool-ng.config
@@ -772,7 +772,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-armv6/crosstool-ng.config
+++ b/linux-armv6/crosstool-ng.config
@@ -773,7 +773,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-armv7/crosstool-ng.config
+++ b/linux-armv7/crosstool-ng.config
@@ -773,7 +773,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-armv7a/crosstool-ng.config
+++ b/linux-armv7a/crosstool-ng.config
@@ -773,7 +773,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-m68k-uclibc/crosstool-ng.config
+++ b/linux-m68k-uclibc/crosstool-ng.config
@@ -682,7 +682,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-mips/crosstool-ng.config
+++ b/linux-mips/crosstool-ng.config
@@ -758,7 +758,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-ppc64le/crosstool-ng.config
+++ b/linux-ppc64le/crosstool-ng.config
@@ -754,7 +754,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-riscv32/crosstool-ng.config
+++ b/linux-riscv32/crosstool-ng.config
@@ -798,7 +798,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-riscv64/crosstool-ng.config
+++ b/linux-riscv64/crosstool-ng.config
@@ -798,7 +798,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-s390x/crosstool-ng.config
+++ b/linux-s390x/crosstool-ng.config
@@ -721,7 +721,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/linux-xtensa-uclibc/crosstool-ng.config
+++ b/linux-xtensa-uclibc/crosstool-ng.config
@@ -686,7 +686,7 @@ CT_ISL_V_0_24=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 CT_ISL_VERSION="0.24"
-CT_ISL_MIRRORS="http://ftp.slackware.com/pub/slackware/slackware64-current/source/l/isl"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
--- a/tools/dockcross-cmake-builder.sh
+++ b/tools/dockcross-cmake-builder.sh
@@ -1,15 +1,17 @@
 #!/usr/bin/env bash

 if (( $# >= 1 )); then
-    image=$1
-    build_file=build-${image%:*}
+    image_complet=$1
+    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"
-    #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
--- a/tools/dockcross-command.sh
+++ b/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"
-    #docker pull dockcross/"$image"
+#    docker pull "dockcross/$image:$tag"

    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,15 +1,17 @@
 #!/usr/bin/env bash

 if (( $# >= 1 )); then
-    image=$1
-    build_file=build-${image%:*}
+    image_complet=$1
+    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"
-    #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
--- a/web-wasi/Dockerfile.in
+++ b/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

--- a/web-wasi/Toolchain.cmake
+++ b/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})
--- a/web-wasi/WASI.cmake
+++ b/web-wasi/WASI.cmake
@@ -0,0 +1,2 @@
+set(WASI 1)
+set(UNIX 1)
Author	SHA1	Message	Date
Bensuperpc	5322eac0bf	Update linux-x64-tinycc and enable openSSL test Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-10-17 14:31:34 +02:00
Matt McCormick	2b6cd4ae1d	Merge pull request #620 from thewtex/wasi-cmake-platform web-wasi: Patch CMake with WASI platform	2021-10-14 20:52:56 -04:00
Matt McCormick	1ec42ecb43	Merge pull request #619 from bensuperpc/update_scripts	2021-10-14 13:54:55 -04:00
Matt McCormick	ef0ff63ed9	web-wasi: Initialize WASI_SDK_PATH for wasi-sdk.cmake, set UNIX	2021-10-13 23:47:29 -04:00
Matt McCormick	93b23ec997	web-wasi: Patch CMake with WASI platform WASI.cmake taken from the wasi-sdk repository. To address the build time warning: System is unknown to cmake, create: Platform/WASI to use this system, please post your config file on discourse.cmake.org so it can be added to cmake	2021-10-13 15:41:28 -04:00
Bensuperpc	4f29f3d665	Disable auto pulling image in scripts Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-10-13 20:03:06 +02:00
Bensuperpc	749fb64f2d	Update scripts Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-10-13 19:44:08 +02:00
Bensuperpc	c994e33650	Merge pull request #617 from bensuperpc/update_tests Update and fix CPython tests	2021-10-13 14:08:58 +02:00
Bensuperpc	b44144d865	Merge pull request #618 from bensuperpc/update_isl Change ISL mirror with new official source	2021-10-13 14:08:44 +02:00
Matt McCormick	17a2266499	Merge pull request #616 from sabelka/nsis-installer add nsis installer for windows images	2021-10-12 14:00:08 -04:00
Matt McCormick	122a1586ef	Merge pull request #615 from sabelka/fix-tmp-wine clean up temporary files left over from wine	2021-10-12 13:59:40 -04:00
Bensuperpc	ec96e82d03	Change ISL mirror with new official source: `cfb7d07ae1` Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-10-12 10:05:21 +02:00
Bensuperpc	a3727bcaa9	Merge remote-tracking branch 'origin/master' into update_isl	2021-10-12 09:57:58 +02:00
Rainer Sabelka	a036aca087	add nsis installer for windows images	2021-10-11 12:49:53 +02:00
Rainer Sabelka	1c2475d42d	clean up temporary files left over from wine	2021-10-11 12:22:05 +02:00