foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-12 11:19:08 -05:00
Code Issues Activity

Merge 0c1b29a057 into 85f96b01b7

Browse source
This commit is contained in:
fanquake 2025-01-31 21:48:39 +01:00 • committed by GitHub
commit c484405d9a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci/test/00_setup_env_arm.sh
View file

@ -10,7 +10,7 @@ export HOST=arm-linux-gnueabihf
export DPKG_ADD_ARCH="armhf" export DPKG_ADD_ARCH="armhf"
export PACKAGES="python3-zmq g++-arm-linux-gnueabihf busybox libc6:armhf libstdc++6:armhf libfontconfig1:armhf libxcb1: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 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 CI_IMAGE_PLATFORM="linux/arm64"
export USE_BUSY_BOX=true export USE_BUSY_BOX=true
export RUN_UNIT_TESTS=true export RUN_UNIT_TESTS=true

7
ci/test/00_setup_env_win64.sh
View file

@ -7,7 +7,7 @@
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
export CONTAINER_NAME=ci_win64 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 CI_IMAGE_PLATFORM="linux/amd64"
export HOST=x86_64-w64-mingw32 export HOST=x86_64-w64-mingw32
export DPKG_ADD_ARCH="i386" 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_UNIT_TESTS=${RUN_UNIT_TESTS:-false}
export RUN_FUNCTIONAL_TESTS=false export RUN_FUNCTIONAL_TESTS=false
export GOAL="deploy" 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 \ 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'"

6
contrib/guix/manifest.scm
View file

@ -90,7 +90,7 @@ chain for " target " development."))
(home-page (package-home-page xgcc)) (home-page (package-home-page xgcc))
(license (package-license 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) (define base-linux-kernel-headers linux-libre-headers-6.1)
@ -542,7 +542,7 @@ inspecting signatures in Mach-O binaries.")
gzip gzip
xz xz
;; Build tools ;; Build tools
gcc-toolchain-12 gcc-toolchain-13
cmake-minimal cmake-minimal
gnu-make gnu-make
;; Scripting ;; Scripting
@ -561,7 +561,7 @@ inspecting signatures in Mach-O binaries.")
((string-contains target "-linux-") ((string-contains target "-linux-")
(list bison (list bison
pkg-config pkg-config
(list gcc-toolchain-12 "static") (list gcc-toolchain-13 "static")
(make-bitcoin-cross-toolchain target))) (make-bitcoin-cross-toolchain target)))
((string-contains target "darwin") ((string-contains target "darwin")
(list clang-toolchain-18 (list clang-toolchain-18