cmake: Regular rebasing of the cmake-staging branch
#304
Conversation
This file contains hidden or 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>
If any of {C,CXX,CPP,LD}FLAGS is specified it should be assigned to
a non-type-specific variable.
This reverts commit 1155978.
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.
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.
Owner
Author
|
My Guix build: |
|
ACK 2a96e31 The easiest one yet! Guix build is on the way. |
Owner
Author
|
Thank you for your review! This branch has been force pushed into the https://github.com/hebasto/bitcoin/tree/cmake-staging. Closing. |
|
Post close Guix: f3d1745aec419f3902e9cdbc6debb98d5596133512529b93969ebe035b48bebc guix-build-2a96e31e600d/output/aarch64-linux-gnu/SHA256SUMS.part
34ed8f60f57357df349807356627a791390e7b70f786e949ce5ce00db45426f9 guix-build-2a96e31e600d/output/aarch64-linux-gnu/bitcoin-2a96e31e600d-aarch64-linux-gnu-debug.tar.gz
f726ba7f393bab027d9724144d849d0510eaa6dfdd004166d4aad9589b2e8c32 guix-build-2a96e31e600d/output/aarch64-linux-gnu/bitcoin-2a96e31e600d-aarch64-linux-gnu.tar.gz
b5c20e0453ed84e0e1f030c02780bdb9740e926cf10380b71d9504ddcf92d40c guix-build-2a96e31e600d/output/arm-linux-gnueabihf/SHA256SUMS.part
abd1e85ac19aec7db1c889214f1bffe9377bc280239a90570a2f8752cf3b0c98 guix-build-2a96e31e600d/output/arm-linux-gnueabihf/bitcoin-2a96e31e600d-arm-linux-gnueabihf-debug.tar.gz
1cfd4e32667b2af01e66c162dbd6ae7cae48c9a3636ab70ab24a71f6846646c4 guix-build-2a96e31e600d/output/arm-linux-gnueabihf/bitcoin-2a96e31e600d-arm-linux-gnueabihf.tar.gz
6e3417c5671752eaf88ff42762542dd3fcdf25ccac8d313eb93f87b6ebabfc04 guix-build-2a96e31e600d/output/arm64-apple-darwin/SHA256SUMS.part
e939494de6e1ce7a68f2db4b67b2622ef43b6162e2f3a882c724409cd99ab11d guix-build-2a96e31e600d/output/arm64-apple-darwin/bitcoin-2a96e31e600d-arm64-apple-darwin-unsigned.tar.gz
8c37d7a7ad2215e918f92f6db8b761d3c88a5e1c417b6dccf1b736ab994494c9 guix-build-2a96e31e600d/output/arm64-apple-darwin/bitcoin-2a96e31e600d-arm64-apple-darwin-unsigned.zip
ca68f1b0b21b9e5ff274a6a674cc35d11d56a8bea1e1753de6be76a5c80395d9 guix-build-2a96e31e600d/output/arm64-apple-darwin/bitcoin-2a96e31e600d-arm64-apple-darwin.tar.gz
56ee41d7c71c11c0bd897533ac8ddd6b3dc3629ff1a00e354adfee481dc59aaf guix-build-2a96e31e600d/output/dist-archive/bitcoin-2a96e31e600d.tar.gz
96b7cdf92db7e590f2ad75998380cc087f9f5db94ed630a6d0ed375ed2631be2 guix-build-2a96e31e600d/output/powerpc64-linux-gnu/SHA256SUMS.part
237c4117a7cc8f062e2bf21b7492692b0d61017333bc68da3e5472a50cd54dc3 guix-build-2a96e31e600d/output/powerpc64-linux-gnu/bitcoin-2a96e31e600d-powerpc64-linux-gnu-debug.tar.gz
19ec6f718b6b3f7d12560d611662458402ab981b520471dcadede60ea72cdbc4 guix-build-2a96e31e600d/output/powerpc64-linux-gnu/bitcoin-2a96e31e600d-powerpc64-linux-gnu.tar.gz
308207f6a3aedd85b171deb7b765aef47fed475d66539b7ebf5304e6971f3213 guix-build-2a96e31e600d/output/riscv64-linux-gnu/SHA256SUMS.part
6c810bb86cc5b6f4e2aed277455a336c986812aa42e65aaf6cc2a1372137a5e0 guix-build-2a96e31e600d/output/riscv64-linux-gnu/bitcoin-2a96e31e600d-riscv64-linux-gnu-debug.tar.gz
5cedb5f9e16131fe762442ee7f234291f5aad374b782be11b0c6de32e372a4c8 guix-build-2a96e31e600d/output/riscv64-linux-gnu/bitcoin-2a96e31e600d-riscv64-linux-gnu.tar.gz
9773cdd3f098a38793b1c42789c92ecfa8b1ac766865dd6fbdc4a32675a432f7 guix-build-2a96e31e600d/output/x86_64-apple-darwin/SHA256SUMS.part
a37122b5001d1587774fd48a85a39cab0278e0a92eafa7f7f77ba8554ada5dcc guix-build-2a96e31e600d/output/x86_64-apple-darwin/bitcoin-2a96e31e600d-x86_64-apple-darwin-unsigned.tar.gz
fd56c6f3db0ca48174e48785cfed11fc15eb21baacae0c275421912cfa19339d guix-build-2a96e31e600d/output/x86_64-apple-darwin/bitcoin-2a96e31e600d-x86_64-apple-darwin-unsigned.zip
523aff3190adda6f7f675287108594e23118b34930d88124eb45676932eed60c guix-build-2a96e31e600d/output/x86_64-apple-darwin/bitcoin-2a96e31e600d-x86_64-apple-darwin.tar.gz
801215ece7fb13c190bbe6d9b3077c7342c9a06f84976e2c4a6594c94ec32dde guix-build-2a96e31e600d/output/x86_64-linux-gnu/SHA256SUMS.part
0c995dc608c2693201086ecb4df72ae2828f5dab6044dc8b1d9e84eb2f11aca0 guix-build-2a96e31e600d/output/x86_64-linux-gnu/bitcoin-2a96e31e600d-x86_64-linux-gnu-debug.tar.gz
0e76738e2732a9dc2c4a0ae8ee91c65b8154abe35ae160e02118d6ec3e18e6d7 guix-build-2a96e31e600d/output/x86_64-linux-gnu/bitcoin-2a96e31e600d-x86_64-linux-gnu.tar.gz
8c1a8d0ad76440d8d0fb2496817f9051073057adc9f3146415311f29c6a70273 guix-build-2a96e31e600d/output/x86_64-w64-mingw32/SHA256SUMS.part
3ac214d2c957426c84191615d03eccee2b31e06f8fa57240e92521800d784448 guix-build-2a96e31e600d/output/x86_64-w64-mingw32/bitcoin-2a96e31e600d-win64-debug.zip
4111270f9fbb0aad17937aa6384deb6b668ee237f25f5a561c1344d778dc94fd guix-build-2a96e31e600d/output/x86_64-w64-mingw32/bitcoin-2a96e31e600d-win64-setup-unsigned.exe
3614a96d00db42fac3d80e1299a883209f9e633a7a7cea53e9bc19c3c565765c guix-build-2a96e31e600d/output/x86_64-w64-mingw32/bitcoin-2a96e31e600d-win64-unsigned.tar.gz
944c43ce7ac4fc149152a6a5eb19e2283f3f5324122e6a43c9e7efff249dcbf7 guix-build-2a96e31e600d/output/x86_64-w64-mingw32/bitcoin-2a96e31e600d-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 must be no conflicts :)