From d87cf4f2ade814db3f4b98274309418955e78b74 Mon Sep 17 00:00:00 2001 From: starg2 <75976488+starg2@users.noreply.github.com> Date: Sat, 1 Jun 2024 19:09:03 +0900 Subject: [PATCH 1/2] Update mingw-w64 and add v5.0.5, v6.0.1, v11.0.1, and v12.0.0 --- README.md | 2 +- build | 26 +++++++++++++++++++++++--- library/config.sh | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 21713b09..6bc95c32 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ In order to use the scripts provided by the MinGW-W64 project it is needed: --no-multilib - build GCC without multilib support (default for DWARF and SEH exception models). --static-gcc - build static GCC. --dyn-deps - build GCC with dynamically dependencies. - --rt-version= - version of mingw-w64 runtime to build. + --rt-version= - version of mingw-w64 runtime to build. --rev=N - number of the build revision. --with-testsuite - run testsuite for packages that contain flags for it. --threads= - used threads model. diff --git a/build b/build index cc582366..3f622595 100755 --- a/build +++ b/build @@ -59,8 +59,8 @@ readonly RUN_ARGS="$@" echo " ada,c,c++,fortran,objc,obj-c++" echo " --jobs=N - specifies number of parallel make threads (defaults to 4)" echo " --rt-version= - specifies mingw-w64 runtime version to build:" - echo " v3, v4, v5, v6, v7, v8, v9, v10, v11 and trunk - specifies specific branches in the git repo" - echo " v3.3.0, v4.0.6, v5.0.4, v6.0.0, v7.0.0, v8.0.2, v9.0.0, v10.0.0, v11.0.0 is a specific release versions, uses the tarball" + echo " v3, v4, v5, v6, v7, v8, v9, v10, v11, v12 and trunk - specifies specific branches in the git repo" + echo " v3.3.0, v4.0.6, v5.0.4, v5.0.5, v6.0.0, v6.0.1, v7.0.0, v8.0.2, v9.0.0, v10.0.0, v11.0.0, v11.0.1, v12.0.0 is a specific release versions, uses the tarball" echo " --buildroot= - specifies the build root directory (path without spaces)" echo " --provided-toolchain= - specifies the path (without spaces) with already existing local toolchain instead of download it" echo " available: dwarf, seh, sjlj, dwarfseh (picks by architecture)" @@ -320,8 +320,12 @@ while [[ $# > 0 ]]; do RUNTIME_VERSION=v11 RUNTIME_BRANCH="v11.x" ;; - trunk) + v12) RUNTIME_VERSION=v12 + RUNTIME_BRANCH="v12.x" + ;; + trunk) + RUNTIME_VERSION=v13 RUNTIME_BRANCH="master" ;; v3.3.0) @@ -336,10 +340,18 @@ while [[ $# > 0 ]]; do RUNTIME_VERSION=v5.0.4 RUNTIME_BRANCH="release" ;; + v5.0.5) + RUNTIME_VERSION=v5.0.5 + RUNTIME_BRANCH="release" + ;; v6.0.0) RUNTIME_VERSION=v6.0.0 RUNTIME_BRANCH="release" ;; + v6.0.1) + RUNTIME_VERSION=v6.0.1 + RUNTIME_BRANCH="release" + ;; v7.0.0) RUNTIME_VERSION=v7.0.0 RUNTIME_BRANCH="release" @@ -360,6 +372,14 @@ while [[ $# > 0 ]]; do RUNTIME_VERSION=v11.0.0 RUNTIME_BRANCH="release" ;; + v11.0.1) + RUNTIME_VERSION=v11.0.1 + RUNTIME_BRANCH="release" + ;; + v12.0.0) + RUNTIME_VERSION=v12.0.0 + RUNTIME_BRANCH="release" + ;; *) die "Unsupported runtime version $RUNTIME_VERSION." ;; diff --git a/library/config.sh b/library/config.sh index bcd89a3f..5714ea16 100644 --- a/library/config.sh +++ b/library/config.sh @@ -100,7 +100,7 @@ SHOW_LOG_ON_ERROR=yes JOBS=4 -RUNTIME_VERSION=v12 +RUNTIME_VERSION=v13 RUNTIME_BRANCH="master" CLANG_GCC_VERSION=gcc-4.9.3 From b93bd775e6f7998f4392e21db5e69acf926ff051 Mon Sep 17 00:00:00 2001 From: starg2 <75976488+starg2@users.noreply.github.com> Date: Sat, 8 Jun 2024 19:36:16 +0900 Subject: [PATCH 2/2] Update CI to build with --rt-version=v12 --- .github/workflows/build_cmake.yml | 60 +++++++++++++++---------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 093b56cb..6105ba97 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -12,53 +12,53 @@ jobs: config: - { name: "x86_64 posix seh msvcrt", - artifact: "x86_64-14.1.0-release-posix-seh-msvcrt-rt_v11-rev0.7z", - build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=posix --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat" + artifact: "x86_64-14.1.0-release-posix-seh-msvcrt-rt_v12-rev0.7z", + build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=posix --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat" } - { name: "x86_64 posix seh ucrt", - artifact: "x86_64-14.1.0-release-posix-seh-ucrt-rt_v11-rev0.7z", - build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=posix --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat" + artifact: "x86_64-14.1.0-release-posix-seh-ucrt-rt_v12-rev0.7z", + build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=posix --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat" } - { name: "x86_64 win32 seh msvcrt", - artifact: "x86_64-14.1.0-release-win32-seh-msvcrt-rt_v11-rev0.7z", - build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=win32 --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat" + artifact: "x86_64-14.1.0-release-win32-seh-msvcrt-rt_v12-rev0.7z", + build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=win32 --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat" } - { name: "x86_64 win32 seh ucrt", - artifact: "x86_64-14.1.0-release-win32-seh-ucrt-rt_v11-rev0.7z", - build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=win32 --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat" + artifact: "x86_64-14.1.0-release-win32-seh-ucrt-rt_v12-rev0.7z", + build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=win32 --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat" } - { name: "x86_64 mcf seh ucrt", - artifact: "x86_64-14.1.0-release-mcf-seh-ucrt-rt_v11-rev0.7z", - build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=mcf --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat" + artifact: "x86_64-14.1.0-release-mcf-seh-ucrt-rt_v12-rev0.7z", + build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=mcf --exceptions=seh --arch=x86_64 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat" } - { name: "i686 posix dwarf msvcrt", - artifact: "i686-14.1.0-release-posix-dwarf-msvcrt-rt_v11-rev0.7z", - build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=posix --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat" + artifact: "i686-14.1.0-release-posix-dwarf-msvcrt-rt_v12-rev0.7z", + build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=posix --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat" } - { name: "i686 posix dwarf ucrt", - artifact: "i686-14.1.0-release-posix-dwarf-ucrt-rt_v11-rev0.7z", - build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=posix --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat" + artifact: "i686-14.1.0-release-posix-dwarf-ucrt-rt_v12-rev0.7z", + build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=posix --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat" } - { name: "i686 win32 dwarf msvcrt", - artifact: "i686-14.1.0-release-win32-dwarf-msvcrt-rt_v11-rev0.7z", - build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=win32 --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat" + artifact: "i686-14.1.0-release-win32-dwarf-msvcrt-rt_v12-rev0.7z", + build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=win32 --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --logviewer-command=cat" } - { name: "i686 win32 dwarf ucrt", - artifact: "i686-14.1.0-release-win32-dwarf-ucrt-rt_v11-rev0.7z", - build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=win32 --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat" + artifact: "i686-14.1.0-release-win32-dwarf-ucrt-rt_v12-rev0.7z", + build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=win32 --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat" } - { name: "i686 mcf dwarf ucrt", - artifact: "i686-14.1.0-release-mcf-dwarf-ucrt-rt_v11-rev0.7z", - build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v11 --threads=mcf --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat" + artifact: "i686-14.1.0-release-mcf-dwarf-ucrt-rt_v12-rev0.7z", + build_cmd: "--mode=gcc-14.1.0 --buildroot=/c/buildroot --jobs=4 --rev=0 --rt-version=v12 --threads=mcf --exceptions=dwarf --arch=i686 --bin-compress --enable-languages=c,c++,fortran --with-default-msvcrt=ucrt --logviewer-command=cat" } steps: @@ -114,43 +114,43 @@ jobs: config: - { name: "x86_64 posix seh msvcrt", - artifact: "x86_64-14.1.0-release-posix-seh-msvcrt-rt_v11-rev0.7z" + artifact: "x86_64-14.1.0-release-posix-seh-msvcrt-rt_v12-rev0.7z" } - { name: "x86_64 posix seh ucrt", - artifact: "x86_64-14.1.0-release-posix-seh-ucrt-rt_v11-rev0.7z" + artifact: "x86_64-14.1.0-release-posix-seh-ucrt-rt_v12-rev0.7z" } - { name: "x86_64 win32 seh msvcrt", - artifact: "x86_64-14.1.0-release-win32-seh-msvcrt-rt_v11-rev0.7z" + artifact: "x86_64-14.1.0-release-win32-seh-msvcrt-rt_v12-rev0.7z" } - { name: "x86_64 win32 seh ucrt", - artifact: "x86_64-14.1.0-release-win32-seh-ucrt-rt_v11-rev0.7z" + artifact: "x86_64-14.1.0-release-win32-seh-ucrt-rt_v12-rev0.7z" } - { name: "x86_64 mcf seh ucrt", - artifact: "x86_64-14.1.0-release-mcf-seh-ucrt-rt_v11-rev0.7z" + artifact: "x86_64-14.1.0-release-mcf-seh-ucrt-rt_v12-rev0.7z" } - { name: "i686 posix dwarf msvcrt", - artifact: "i686-14.1.0-release-posix-dwarf-msvcrt-rt_v11-rev0.7z" + artifact: "i686-14.1.0-release-posix-dwarf-msvcrt-rt_v12-rev0.7z" } - { name: "i686 posix dwarf ucrt", - artifact: "i686-14.1.0-release-posix-dwarf-ucrt-rt_v11-rev0.7z" + artifact: "i686-14.1.0-release-posix-dwarf-ucrt-rt_v12-rev0.7z" } - { name: "i686 win32 dwarf msvcrt", - artifact: "i686-14.1.0-release-win32-dwarf-msvcrt-rt_v11-rev0.7z" + artifact: "i686-14.1.0-release-win32-dwarf-msvcrt-rt_v12-rev0.7z" } - { name: "i686 win32 dwarf ucrt", - artifact: "i686-14.1.0-release-win32-dwarf-ucrt-rt_v11-rev0.7z" + artifact: "i686-14.1.0-release-win32-dwarf-ucrt-rt_v12-rev0.7z" } - { name: "i686 mcf dwarf ucrt", - artifact: "i686-14.1.0-release-mcf-dwarf-ucrt-rt_v11-rev0.7z" + artifact: "i686-14.1.0-release-mcf-dwarf-ucrt-rt_v12-rev0.7z" } needs: release