From cbc65b3ad5ad573844f9841199e1b0817f6c648a Mon Sep 17 00:00:00 2001 From: fanquake Date: Mon, 15 Apr 2024 12:34:28 +0100 Subject: [PATCH 1/2] guix: use GCC 13.3.0 for base toolchain. --- contrib/guix/manifest.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 3244a8dbdc..479cdc6f33 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -90,7 +90,7 @@ chain for " target " development.")) (home-page (package-home-page xgcc)) (license (package-license xgcc))))) -(define base-gcc gcc-12) ;; 12.4.0 +(define base-gcc gcc-13) ;; 13.3.0 (define base-linux-kernel-headers linux-libre-headers-6.1) @@ -542,7 +542,7 @@ inspecting signatures in Mach-O binaries.") gzip xz ;; Build tools - gcc-toolchain-12 + gcc-toolchain-13 cmake-minimal gnu-make ;; Scripting @@ -561,7 +561,7 @@ inspecting signatures in Mach-O binaries.") ((string-contains target "-linux-") (list bison pkg-config - (list gcc-toolchain-12 "static") + (list gcc-toolchain-13 "static") (make-bitcoin-cross-toolchain target))) ((string-contains target "darwin") (list clang-toolchain-18 From 0c1b29a05777256c5ee686fff60f281dfeae289c Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 23 May 2024 10:07:23 +0100 Subject: [PATCH 2/2] ci: use GCC 13 for some jobs --- ci/test/00_setup_env_arm.sh | 2 +- ci/test/00_setup_env_win64.sh | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ci/test/00_setup_env_arm.sh b/ci/test/00_setup_env_arm.sh index 67e43aca0d..a0c8f783a9 100755 --- a/ci/test/00_setup_env_arm.sh +++ b/ci/test/00_setup_env_arm.sh @@ -10,7 +10,7 @@ export HOST=arm-linux-gnueabihf export DPKG_ADD_ARCH="armhf" export PACKAGES="python3-zmq g++-arm-linux-gnueabihf busybox libc6:armhf libstdc++6:armhf libfontconfig1:armhf libxcb1:armhf" export CONTAINER_NAME=ci_arm_linux -export CI_IMAGE_NAME_TAG="docker.io/debian:bookworm" # Check that https://packages.debian.org/bookworm/g++-arm-linux-gnueabihf (version 12.2, similar to guix) can cross-compile +export CI_IMAGE_NAME_TAG="docker.io/ubuntu:noble" # Check that https://packages.ubuntu.com/noble/g++-arm-linux-gnueabihf (version 13.3, similar to guix) can cross-compile export CI_IMAGE_PLATFORM="linux/arm64" export USE_BUSY_BOX=true export RUN_UNIT_TESTS=true diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index 985b2941bf..f65bd1bc7f 100755 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -7,7 +7,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_win64 -export CI_IMAGE_NAME_TAG="docker.io/debian:bookworm" # Check that https://packages.debian.org/bookworm/g++-mingw-w64-x86-64-posix (version 12.2, similar to guix) can cross-compile +export CI_IMAGE_NAME_TAG="docker.io/ubuntu:noble" # Check that g++-mingw-w64-x86-64-posix (version 13.2, similar to guix) can cross-compile export CI_IMAGE_PLATFORM="linux/amd64" export HOST=x86_64-w64-mingw32 export DPKG_ADD_ARCH="i386" @@ -17,8 +17,5 @@ export PACKAGES="nsis g++-mingw-w64-x86-64-posix wine-binfmt wine64 wine32 file" export RUN_UNIT_TESTS=${RUN_UNIT_TESTS:-false} export RUN_FUNCTIONAL_TESTS=false export GOAL="deploy" -# Prior to 11.0.0, the mingw-w64 headers were missing noreturn attributes, causing warnings when -# cross-compiling for Windows. https://sourceforge.net/p/mingw-w64/bugs/306/ -# https://github.com/mingw-w64/mingw-w64/commit/1690994f515910a31b9fb7c7bd3a52d4ba987abe export BITCOIN_CONFIG="-DREDUCE_EXPORTS=ON -DBUILD_GUI_TESTS=OFF \ --DCMAKE_CXX_FLAGS='-Wno-error=return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'" +-DCMAKE_CXX_FLAGS='-Wno-error=maybe-uninitialized -Wno-error=array-bounds'"