cmake: Regular rebasing of the cmake-staging branch
#264
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
We don't actually use a c compiler as part of Core's build (only for secp). We should be testing against what we're actually using instead.
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>
CMake allows to incorporate compile defines into a target as its property with applying automatically where required.
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.
This was referenced Jul 14, 2024
Merged
|
ACK a7f3ca7 Ran through steps and got a clean diff. Guix build matches b9001b0fb75e6dc428cbfbc1859caaeba32890c4ef8333645882cd2750b505af guix-build-a7f3ca7b17f2/output/aarch64-linux-gnu/SHA256SUMS.part
3fcd8345f7a90e0e8da259748c8a5058089eefb2633d44f537d8263c24770de3 guix-build-a7f3ca7b17f2/output/aarch64-linux-gnu/bitcoin-a7f3ca7b17f2-aarch64-linux-gnu-debug.tar.gz
a884d02ef70a008749606643ed9513f730c677ba54baf025a41368726103dfe3 guix-build-a7f3ca7b17f2/output/aarch64-linux-gnu/bitcoin-a7f3ca7b17f2-aarch64-linux-gnu.tar.gz
50596ab0714c89ca052d31542c8d4f04cd26df866038c2fa9cd745038faa2afc guix-build-a7f3ca7b17f2/output/arm-linux-gnueabihf/SHA256SUMS.part
95f7dcc64a09ea0e630ec88344b72ed3e4ffc0b03c7e13ce10b0d242f7127c96 guix-build-a7f3ca7b17f2/output/arm-linux-gnueabihf/bitcoin-a7f3ca7b17f2-arm-linux-gnueabihf-debug.tar.gz
ba9c55f6b09d6fc60df967fc5ebc217dbd24f84c0d85f93a8344bdeec1d850f8 guix-build-a7f3ca7b17f2/output/arm-linux-gnueabihf/bitcoin-a7f3ca7b17f2-arm-linux-gnueabihf.tar.gz
52329d191a7673b45c2941829be4b21ae0656a539969c4f7749326b723b62105 guix-build-a7f3ca7b17f2/output/arm64-apple-darwin/SHA256SUMS.part
223fc87e27aa57f39dfaaa26e1e06f030de6430fad448048238f2601f1f4c24a guix-build-a7f3ca7b17f2/output/arm64-apple-darwin/bitcoin-a7f3ca7b17f2-arm64-apple-darwin-unsigned.tar.gz
44c715049aafa13ae3011066960fd4393b3a7dc802df4bcc3ff7964bd2691b8d guix-build-a7f3ca7b17f2/output/arm64-apple-darwin/bitcoin-a7f3ca7b17f2-arm64-apple-darwin-unsigned.zip
fcae437973400bd31455fa0c30688c5804b684aa3b79fed6686206a0f6a5c68d guix-build-a7f3ca7b17f2/output/arm64-apple-darwin/bitcoin-a7f3ca7b17f2-arm64-apple-darwin.tar.gz
6d3ed1be6478c40bd715f0ba6b41d1c111e9091e45dd500a090e7d89a4f7fa54 guix-build-a7f3ca7b17f2/output/dist-archive/bitcoin-a7f3ca7b17f2.tar.gz
9fa7c5878403ffd2412a8b8d4ba9c925fc82d31ce5ff675631745be3a1689e6f guix-build-a7f3ca7b17f2/output/powerpc64-linux-gnu/SHA256SUMS.part
ec16b8ce26af2af16144b215c6ae332cbcab961f0dfa1f109bfa8c641805ddf0 guix-build-a7f3ca7b17f2/output/powerpc64-linux-gnu/bitcoin-a7f3ca7b17f2-powerpc64-linux-gnu-debug.tar.gz
8e5013429a078ab90bbb8a3abc1b8eef8416416748068169b61584d7f8d27843 guix-build-a7f3ca7b17f2/output/powerpc64-linux-gnu/bitcoin-a7f3ca7b17f2-powerpc64-linux-gnu.tar.gz
b6cf16dd0595cd895c4596a50928218bf621aee82c2c6b227ff8e533f3443923 guix-build-a7f3ca7b17f2/output/riscv64-linux-gnu/SHA256SUMS.part
97b8e5f7f36bd0354ea80e3621e338f330ec11d7783ee3c74f09e25170144924 guix-build-a7f3ca7b17f2/output/riscv64-linux-gnu/bitcoin-a7f3ca7b17f2-riscv64-linux-gnu-debug.tar.gz
8f8307bc1ce1bb1926df689e111d6a8fb5295923915acfb8ff47508e465a30d4 guix-build-a7f3ca7b17f2/output/riscv64-linux-gnu/bitcoin-a7f3ca7b17f2-riscv64-linux-gnu.tar.gz
52f4b18d79e6fe28b8e9488caf47abc70b920dd298ae16bc627c4c48b1bbb5d6 guix-build-a7f3ca7b17f2/output/x86_64-apple-darwin/SHA256SUMS.part
a4eaa873984f6715370e2ae4563e69a855fe155ca060682939322ed308c591f1 guix-build-a7f3ca7b17f2/output/x86_64-apple-darwin/bitcoin-a7f3ca7b17f2-x86_64-apple-darwin-unsigned.tar.gz
13f0ae74594d291996c899f89dcbf57b0176db958435dc9f137960861333cc65 guix-build-a7f3ca7b17f2/output/x86_64-apple-darwin/bitcoin-a7f3ca7b17f2-x86_64-apple-darwin-unsigned.zip
997261410a37c9620400963793ff34f39db384e386745fc0e75d9980e6d5510b guix-build-a7f3ca7b17f2/output/x86_64-apple-darwin/bitcoin-a7f3ca7b17f2-x86_64-apple-darwin.tar.gz
5f353ef488d2bbb244b0cc99d1f20ea5f2f8ebe3372b10bf69fd450c26ca8627 guix-build-a7f3ca7b17f2/output/x86_64-linux-gnu/SHA256SUMS.part
1752d83ef696586efe08888361c3542f17d2b23902875017c6a23f86a6490514 guix-build-a7f3ca7b17f2/output/x86_64-linux-gnu/bitcoin-a7f3ca7b17f2-x86_64-linux-gnu-debug.tar.gz
988ed7bae033403201b51e988a598ff4bdfc5c684487f748455fe3ce537e8aef guix-build-a7f3ca7b17f2/output/x86_64-linux-gnu/bitcoin-a7f3ca7b17f2-x86_64-linux-gnu.tar.gz
01918f4926eb694850647a9a9c1ab76ad225f8b10399b555939b6ca053ab6847 guix-build-a7f3ca7b17f2/output/x86_64-w64-mingw32/SHA256SUMS.part
3b8a0f3aa3abf5a65f2d66ce1aed00cd31ba979454c8322b71caeaf7d6e63fbd guix-build-a7f3ca7b17f2/output/x86_64-w64-mingw32/bitcoin-a7f3ca7b17f2-win64-debug.zip
227be819cc1f7a9107d0238125cbb18ca873d075634700b020aa3dc7ed122a4b guix-build-a7f3ca7b17f2/output/x86_64-w64-mingw32/bitcoin-a7f3ca7b17f2-win64-setup-unsigned.exe
e7a5164492accc585e0d71fdcab4b35cc033918e11b99a5e1fd57f88e853588f guix-build-a7f3ca7b17f2/output/x86_64-w64-mingw32/bitcoin-a7f3ca7b17f2-win64-unsigned.tar.gz
6493c2f7130d84846538463d68ef333df67c0811113812ab347c1fad4a85d149 guix-build-a7f3ca7b17f2/output/x86_64-w64-mingw32/bitcoin-a7f3ca7b17f2-win64.zip |
|
Thank you for your review! This branch has been force pushed into the https://github.com/hebasto/bitcoin/tree/cmake-staging. Closing. |
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 one, which includes the main build system changes, with the squashed "!fixup" commits.
Steps to reproduce:
There are a few conflicts that have to be resolved.
-Wundefbitcoin/bitcoin#29876target_weight) bitcoin/bitcoin#30162FORCE_USE_SYSTEM_CLANGbitcoin/bitcoin#30201As for CI failures, please see:
Guix build: