Merge branch 'master' into add_scripts

Update to GCC11 on windows images

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

.github/workflows/expired.yml

@@ -12,8 +12,8 @@ jobs:
           exempt-issue-milestones: 'future,alpha,beta,release'
           exempt-pr-milestones: 'bugfix,improvement'
           exempt-all-pr-assignees: true
-          stale-issue-message: 'This issue is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 15 days.'
+          stale-issue-message: 'This issue is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
-          stale-pr-message: 'This PR is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 15 days.'
+          stale-pr-message: 'This PR is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
           close-issue-message: 'This issue was closed because it has been stalled for 30 days with no activity.'
           close-pr-message: 'This PR was closed because it has been stalled for 30 days with no activity.'
           days-before-issue-stale: 120

common/common.windows

@@ -15,8 +15,8 @@
 #  ARG MXE_TARGET_LINK=shared
 #
 
-# mxe master 2020-12-21
+# mxe master 2021-07-07
-ARG MXE_GIT_TAG=a7a45e4e51fe70032305b828a001aac848f74fdb
+ARG MXE_GIT_TAG=29aac96601e6428900b1e9b2befb4cc567aff298
 
 ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake
 
@@ -88,7 +88,7 @@ RUN \
   cd /usr/src/mxe && \
   echo "MXE_TARGETS := ${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}" > settings.mk && \
   echo "MXE_USE_CCACHE :="                                                       >> settings.mk && \
-  echo "MXE_PLUGIN_DIRS := plugins/gcc10"                                        >> settings.mk && \
+  echo "MXE_PLUGIN_DIRS := plugins/gcc11"                                        >> settings.mk && \
   echo "LOCAL_PKG_LIST := cc cmake"                                              >> settings.mk && \
   echo ".DEFAULT local-pkg-list:"                                                >> settings.mk && \
   echo "local-pkg-list: \$(LOCAL_PKG_LIST)"                                      >> settings.mk && \

linux-arm64/Dockerfile.in

@@ -4,7 +4,8 @@ FROM dockcross/base:latest
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 #include "common.crosstool"
 

linux-armv5-musl/Dockerfile.in

@@ -6,7 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # musleabi as default glibc
 
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 #include "common.crosstool"
 

linux-armv5/Dockerfile.in

@@ -6,7 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 #include "common.crosstool"
 

linux-armv6/Dockerfile.in

@@ -3,7 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 # This is for 32-bit ARMv6 Linux
 # Raspberry Pi is ARMv6+VFP2

linux-armv7/Dockerfile.in

@@ -3,7 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 # This is for 32-bit ARMv7 Linux
 #include "common.crosstool"

linux-armv7a/Dockerfile.in

@@ -4,7 +4,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # This is for 32-bit ARMv7 Linux
 
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 #include "common.crosstool"
 

linux-m68k-uclibc/Dockerfile.in

@@ -3,7 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-ENV CT_VERSION 94b98a4cc96ff6c4ca982ea19db953447e802919
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 ENV QEMU_VERSION 6.0.0
 

linux-mips/Dockerfile.in

@@ -4,7 +4,8 @@ FROM dockcross/base:latest
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 #include "common.crosstool"
 

linux-ppc64le/Dockerfile.in

@@ -3,7 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 ENV QEMU_VERSION 6.0.0
 

linux-riscv32/Dockerfile.in

@@ -3,7 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-ENV CT_VERSION 94b98a4cc96ff6c4ca982ea19db953447e802919
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 ENV QEMU_VERSION 6.0.0
 

linux-riscv64/Dockerfile.in

@@ -3,7 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Crosstool-ng version
 # We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-ENV CT_VERSION 94b98a4cc96ff6c4ca982ea19db953447e802919
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 ENV QEMU_VERSION 6.0.0
 

linux-s390x/Dockerfile.in

@@ -3,7 +3,9 @@ FROM dockcross/base:latest
 # This is for 64-bit S390X Linux machine
 
 # Crosstool-ng version
-ENV CT_VERSION crosstool-ng-1.23.0
+# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
+# crosstool-ng master 2021-07-07
+ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
 #include "common.crosstool"
 

tools/builder/cmake.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -euo pipefail
+
+source $(dirname "$0")/functions/cmake_fn.sh
+
+cmake_build $@

tools/builder/cmake_all.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -euo pipefail
+
+curl https://raw.githubusercontent.com/dockcross/dockcross/master/Makefile -o dockcross-Makefile
+make -f dockcross-Makefile display_images
+
+source $(dirname "$0")/functions/cmake_fn.sh
+
+for image in $(make -f dockcross-Makefile display_images); do
+    cmake_build $image $@
+done

tools/builder/functions/cmake_fn.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -euo pipefail
+
+cmake_build () {
+    local image=$1
+    local build_file=build-${image%:*}
+    shift 1
+    local cmake_arg=$@
+    echo "cmake arg: $cmake_arg"
+
+    echo "Pulling dockcross/$image"
+    docker pull dockcross/$image
+    echo "Make script dockcross-$image"
+    docker run --rm dockcross/$image > ./dockcross-$image
+    chmod +x ./dockcross-$image
+    echo "Build $build_file"
+    ./dockcross-$image cmake -B$build_file -H. -GNinja $cmake_arg
+    ./dockcross-$image ninja -C$build_file
+}

tools/builder/functions/makefile_fn.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -euo pipefail
+
+makefile_build () {
+    local image=$1
+    shift 1
+
+    echo "Pulling dockcross/$image"
+    docker pull dockcross/$image
+    echo "Make script dockcross-$image"
+    docker run --rm dockcross/$image > ./dockcross-$image
+    chmod +x ./dockcross-$image
+    echo "Build..."
+    ./dockcross-$image bash -c 'make CXX=$CXX CC=$CC AR=$AR AS=$AS CPP=$CPP FC=$FC'
+}

tools/builder/makefile.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -euo pipefail
+
+source $(dirname "$0")/functions/makefile_fn.sh
+
+makefile_build $@

tools/builder/makefile_all.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -euo pipefail
+
+curl https://raw.githubusercontent.com/dockcross/dockcross/master/Makefile -o dockcross-Makefile
+make -f dockcross-Makefile display_images
+
+source $(dirname "$0")/functions/makefile_fn.sh
+
+for image in $(make -f dockcross-Makefile display_images); do
+    makefile_build $image $@
+done