cmake: Regular rebasing of the cmake-staging branch
#334
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also add a sanity check for non-encapsulated (directory-wide) build properties.
Co-authored-by: Cory Fields <cory-nospam-@coryfields.com> Co-authored-by: Vasil Dimov <vd@FreeBSD.org>
Co-authored-by: Cory Fields <cory-nospam-@coryfields.com>
To configure CMake for cross-compiling, use
`--toolchain depends/${HOST}/toolchain.cmake` command-line option.
The content of those variables is appended to the each target after the flags added by the build system.
Co-authored-by: Lőrinc <pap.lorinc@gmail.com> Co-authored-by: pablomartin4btc <pablomartin4btc@gmail.com>
Keep this commit at the top when rebasing.
This change fixes CI jobs as the `miniupnpc` source archive is not available neither at https://miniupnp.tuxfamily.org nor at https://bitcoincore.org/depends-sources at this moment.
Ready for review again! |
|
ACK 818a3c0 Clean diff between op process and Running Guix build |
|
My Guix build: |
TheCharlatan
approved these changes
Aug 17, 2024
There was a problem hiding this comment.
lgtm
Guix builds (aarch64):
450e47fcd499ff52b36490ec7afda903f4e23d7343f73cf28c8aa14d84759ece guix-build-818a3c07fb48/output/aarch64-linux-gnu/SHA256SUMS.part
406714827e2904be7b865ba03669f0a40bb49714334578c1813581f5543db1c1 guix-build-818a3c07fb48/output/aarch64-linux-gnu/bitcoin-818a3c07fb48-aarch64-linux-gnu-debug.tar.gz
3cf9aa25ea417730beea258799ae034c8699848e09928d04365e202e3df4d78d guix-build-818a3c07fb48/output/aarch64-linux-gnu/bitcoin-818a3c07fb48-aarch64-linux-gnu.tar.gz
064e9873195ea6b81aebd91f50b7675823090467f39fd27cc2c6cb2964843a5e guix-build-818a3c07fb48/output/arm-linux-gnueabihf/SHA256SUMS.part
319db0eb58f29ea0c94593c59f9d92acbd49475519b0860b24be1fd615414453 guix-build-818a3c07fb48/output/arm-linux-gnueabihf/bitcoin-818a3c07fb48-arm-linux-gnueabihf-debug.tar.gz
1a149e92d64d1f05f3475e745c88629fd9b63149d0e7edf3aaa754acf771a819 guix-build-818a3c07fb48/output/arm-linux-gnueabihf/bitcoin-818a3c07fb48-arm-linux-gnueabihf.tar.gz
8e85461e4f3eab6f89ca008f4017e75a7328b2e2c6c842362168fb78fe95243a guix-build-818a3c07fb48/output/arm64-apple-darwin/SHA256SUMS.part
50affef2f0d0b40c208801a48be5abb04a10fa1c8097424aba9429efeae96b6a guix-build-818a3c07fb48/output/arm64-apple-darwin/bitcoin-818a3c07fb48-arm64-apple-darwin-unsigned.tar.gz
9fc625daa494396ff8f71b8dde060b1a0e90e01c94f6e5304e4bdc95dad92a3f guix-build-818a3c07fb48/output/arm64-apple-darwin/bitcoin-818a3c07fb48-arm64-apple-darwin-unsigned.zip
745c339ec4d300a19a0d70c44fa047d074c321ddfc47039d6fb625957b96b5f5 guix-build-818a3c07fb48/output/arm64-apple-darwin/bitcoin-818a3c07fb48-arm64-apple-darwin.tar.gz
60921b3be448ff2e128be98e63a940c7f5327e10def6b58cf36665cd157967ab guix-build-818a3c07fb48/output/dist-archive/bitcoin-818a3c07fb48.tar.gz
56f75f7b811da2fc209e41155043e0765938128934964535c12c0b2992cf3484 guix-build-818a3c07fb48/output/powerpc64-linux-gnu/SHA256SUMS.part
fc9afedb71bc5a1bde7cf08ed937dc68cca76faadf17f654e8d0b0d276070909 guix-build-818a3c07fb48/output/powerpc64-linux-gnu/bitcoin-818a3c07fb48-powerpc64-linux-gnu-debug.tar.gz
6a67d618819bf8a78785d4f795b25bc37f756ff1f859d8f06b505422452f6b4e guix-build-818a3c07fb48/output/powerpc64-linux-gnu/bitcoin-818a3c07fb48-powerpc64-linux-gnu.tar.gz
7b09ea93f4778eb81d1b29d3c26b08f1c9c5de4fb4453536651bf1c2ece1c66b guix-build-818a3c07fb48/output/riscv64-linux-gnu/SHA256SUMS.part
118c1fc1cc5973d623ca0a4d96973b5c4e8f0d2dc1354b09d5244ec2df01f236 guix-build-818a3c07fb48/output/riscv64-linux-gnu/bitcoin-818a3c07fb48-riscv64-linux-gnu-debug.tar.gz
9d2794fb6f00517ba3ab279e50ecd42d9e25dd4fd5e61b5f8fb31fc81e9c5931 guix-build-818a3c07fb48/output/riscv64-linux-gnu/bitcoin-818a3c07fb48-riscv64-linux-gnu.tar.gz
d6d9910d4c76b553c69d55418b0f577937beef60b4952e241e7a389df5918dc9 guix-build-818a3c07fb48/output/x86_64-apple-darwin/SHA256SUMS.part
8b7409b6c3eaf5425b58055830c506c96a60b96a658df7b41f08ccd4d2cfe7ef guix-build-818a3c07fb48/output/x86_64-apple-darwin/bitcoin-818a3c07fb48-x86_64-apple-darwin-unsigned.tar.gz
86443fa7f87c38ec127ac88abe73fc9bcc8ae17adc87345daf930509ebe22f3a guix-build-818a3c07fb48/output/x86_64-apple-darwin/bitcoin-818a3c07fb48-x86_64-apple-darwin-unsigned.zip
ffcf5040db9c5b182df7b84dc41fba79231d1274b7759b87cd72f680b1c3340a guix-build-818a3c07fb48/output/x86_64-apple-darwin/bitcoin-818a3c07fb48-x86_64-apple-darwin.tar.gz
54292290975c5ff1028784dfce5fc4726a94c260665051fe65c4c521e8d0247a guix-build-818a3c07fb48/output/x86_64-linux-gnu/SHA256SUMS.part
a28cd6961446b3302d6a1410a14f597f81839116d09b169709e00f9d783d430f guix-build-818a3c07fb48/output/x86_64-linux-gnu/bitcoin-818a3c07fb48-x86_64-linux-gnu-debug.tar.gz
cf46aae7ce6d959111bd8516093a9bd6aa3a11f0c1c8ae33a9de6bbb0767d333 guix-build-818a3c07fb48/output/x86_64-linux-gnu/bitcoin-818a3c07fb48-x86_64-linux-gnu.tar.gz
e6a780c7e9124b2b3423cdefa7ed6630f7fbf70a381e53d606580a9cca8a9f05 guix-build-818a3c07fb48/output/x86_64-w64-mingw32/SHA256SUMS.part
d88527ec42dd21ba366148b926205d01ad06fcc2e44796c05f9cda53a7b7a3ad guix-build-818a3c07fb48/output/x86_64-w64-mingw32/bitcoin-818a3c07fb48-win64-debug.zip
0b6dec24b248b3e5b45188554842b24d5341a1321608087a6adaea16c7228e3e guix-build-818a3c07fb48/output/x86_64-w64-mingw32/bitcoin-818a3c07fb48-win64-setup-unsigned.exe
a0779f90be6a3b2e252c167892ce94158b47474e150565f3ea83862f7fc58862 guix-build-818a3c07fb48/output/x86_64-w64-mingw32/bitcoin-818a3c07fb48-win64-unsigned.tar.gz
310d3e0d46a72d6040ff80712c65cb39c4cbbafd714ae69a6e12f9502b0b6853 guix-build-818a3c07fb48/output/x86_64-w64-mingw32/bitcoin-818a3c07fb48-win64.zip
|
Thank you for your reviews! This branch has been force pushed into the https://github.com/hebasto/bitcoin/tree/cmake-staging. Closing. |
|
x86 guix build 450e47fcd499ff52b36490ec7afda903f4e23d7343f73cf28c8aa14d84759ece guix-build-818a3c07fb48/output/aarch64-linux-gnu/SHA256SUMS.part
406714827e2904be7b865ba03669f0a40bb49714334578c1813581f5543db1c1 guix-build-818a3c07fb48/output/aarch64-linux-gnu/bitcoin-818a3c07fb48-aarch64-linux-gnu-debug.tar.gz
3cf9aa25ea417730beea258799ae034c8699848e09928d04365e202e3df4d78d guix-build-818a3c07fb48/output/aarch64-linux-gnu/bitcoin-818a3c07fb48-aarch64-linux-gnu.tar.gz
064e9873195ea6b81aebd91f50b7675823090467f39fd27cc2c6cb2964843a5e guix-build-818a3c07fb48/output/arm-linux-gnueabihf/SHA256SUMS.part
319db0eb58f29ea0c94593c59f9d92acbd49475519b0860b24be1fd615414453 guix-build-818a3c07fb48/output/arm-linux-gnueabihf/bitcoin-818a3c07fb48-arm-linux-gnueabihf-debug.tar.gz
1a149e92d64d1f05f3475e745c88629fd9b63149d0e7edf3aaa754acf771a819 guix-build-818a3c07fb48/output/arm-linux-gnueabihf/bitcoin-818a3c07fb48-arm-linux-gnueabihf.tar.gz
8e85461e4f3eab6f89ca008f4017e75a7328b2e2c6c842362168fb78fe95243a guix-build-818a3c07fb48/output/arm64-apple-darwin/SHA256SUMS.part
50affef2f0d0b40c208801a48be5abb04a10fa1c8097424aba9429efeae96b6a guix-build-818a3c07fb48/output/arm64-apple-darwin/bitcoin-818a3c07fb48-arm64-apple-darwin-unsigned.tar.gz
9fc625daa494396ff8f71b8dde060b1a0e90e01c94f6e5304e4bdc95dad92a3f guix-build-818a3c07fb48/output/arm64-apple-darwin/bitcoin-818a3c07fb48-arm64-apple-darwin-unsigned.zip
745c339ec4d300a19a0d70c44fa047d074c321ddfc47039d6fb625957b96b5f5 guix-build-818a3c07fb48/output/arm64-apple-darwin/bitcoin-818a3c07fb48-arm64-apple-darwin.tar.gz
60921b3be448ff2e128be98e63a940c7f5327e10def6b58cf36665cd157967ab guix-build-818a3c07fb48/output/dist-archive/bitcoin-818a3c07fb48.tar.gz
56f75f7b811da2fc209e41155043e0765938128934964535c12c0b2992cf3484 guix-build-818a3c07fb48/output/powerpc64-linux-gnu/SHA256SUMS.part
fc9afedb71bc5a1bde7cf08ed937dc68cca76faadf17f654e8d0b0d276070909 guix-build-818a3c07fb48/output/powerpc64-linux-gnu/bitcoin-818a3c07fb48-powerpc64-linux-gnu-debug.tar.gz
6a67d618819bf8a78785d4f795b25bc37f756ff1f859d8f06b505422452f6b4e guix-build-818a3c07fb48/output/powerpc64-linux-gnu/bitcoin-818a3c07fb48-powerpc64-linux-gnu.tar.gz
7b09ea93f4778eb81d1b29d3c26b08f1c9c5de4fb4453536651bf1c2ece1c66b guix-build-818a3c07fb48/output/riscv64-linux-gnu/SHA256SUMS.part
118c1fc1cc5973d623ca0a4d96973b5c4e8f0d2dc1354b09d5244ec2df01f236 guix-build-818a3c07fb48/output/riscv64-linux-gnu/bitcoin-818a3c07fb48-riscv64-linux-gnu-debug.tar.gz
9d2794fb6f00517ba3ab279e50ecd42d9e25dd4fd5e61b5f8fb31fc81e9c5931 guix-build-818a3c07fb48/output/riscv64-linux-gnu/bitcoin-818a3c07fb48-riscv64-linux-gnu.tar.gz
d6d9910d4c76b553c69d55418b0f577937beef60b4952e241e7a389df5918dc9 guix-build-818a3c07fb48/output/x86_64-apple-darwin/SHA256SUMS.part
8b7409b6c3eaf5425b58055830c506c96a60b96a658df7b41f08ccd4d2cfe7ef guix-build-818a3c07fb48/output/x86_64-apple-darwin/bitcoin-818a3c07fb48-x86_64-apple-darwin-unsigned.tar.gz
86443fa7f87c38ec127ac88abe73fc9bcc8ae17adc87345daf930509ebe22f3a guix-build-818a3c07fb48/output/x86_64-apple-darwin/bitcoin-818a3c07fb48-x86_64-apple-darwin-unsigned.zip
ffcf5040db9c5b182df7b84dc41fba79231d1274b7759b87cd72f680b1c3340a guix-build-818a3c07fb48/output/x86_64-apple-darwin/bitcoin-818a3c07fb48-x86_64-apple-darwin.tar.gz
54292290975c5ff1028784dfce5fc4726a94c260665051fe65c4c521e8d0247a guix-build-818a3c07fb48/output/x86_64-linux-gnu/SHA256SUMS.part
a28cd6961446b3302d6a1410a14f597f81839116d09b169709e00f9d783d430f guix-build-818a3c07fb48/output/x86_64-linux-gnu/bitcoin-818a3c07fb48-x86_64-linux-gnu-debug.tar.gz
cf46aae7ce6d959111bd8516093a9bd6aa3a11f0c1c8ae33a9de6bbb0767d333 guix-build-818a3c07fb48/output/x86_64-linux-gnu/bitcoin-818a3c07fb48-x86_64-linux-gnu.tar.gz
e6a780c7e9124b2b3423cdefa7ed6630f7fbf70a381e53d606580a9cca8a9f05 guix-build-818a3c07fb48/output/x86_64-w64-mingw32/SHA256SUMS.part
d88527ec42dd21ba366148b926205d01ad06fcc2e44796c05f9cda53a7b7a3ad guix-build-818a3c07fb48/output/x86_64-w64-mingw32/bitcoin-818a3c07fb48-win64-debug.zip
0b6dec24b248b3e5b45188554842b24d5341a1321608087a6adaea16c7228e3e guix-build-818a3c07fb48/output/x86_64-w64-mingw32/bitcoin-818a3c07fb48-win64-setup-unsigned.exe
a0779f90be6a3b2e252c167892ce94158b47474e150565f3ea83862f7fc58862 guix-build-818a3c07fb48/output/x86_64-w64-mingw32/bitcoin-818a3c07fb48-win64-unsigned.tar.gz
310d3e0d46a72d6040ff80712c65cb39c4cbbafd714ae69a6e12f9502b0b6853 guix-build-818a3c07fb48/output/x86_64-w64-mingw32/bitcoin-818a3c07fb48-win64.zip |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the cmake-staging branch rebased on the recent bitcoin/master branch, which includes the main build system changes, with the squashed "!fixup" commits.
Steps to reproduce:
There is a conflict that has to be resolved.
Squash "[FIXUP]" commits that were not handled automatically (there must be a zero-diff change).
Port build system changes from: