Add python3-dev

Add python3-dev

common/common.debian

@@ -25,7 +25,7 @@ RUN \
     ncurses-dev \
     pkg-config \
     pax \
-    python3 \
+    python3-dev \
     python3-pip \
     rsync \
     sed \

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-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"

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"

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-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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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)