cmake: Regular rebasing of the cmake-staging branch#75
Closed
hebasto wants to merge 48 commits into
Closed
Conversation
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}/share/toolchain.cmake` command-line option.
Keep this commit at the top when rebasing.
Owner
Author
|
Friendly ping @vasild @TheCharlatan @theuni @pablomartin4btc @m3dwards :) |
Owner
Author
|
CI looks green :) The plan is to process #72 after approving this PR. |
sedited
approved these changes
Jan 9, 2024
Owner
Author
|
Thank you for your review! This branch has been force pushed into the https://github.com/hebasto/bitcoin/tree/cmake-staging. Closing. |
pablomartin4btc
left a comment
pablomartin4btc
left a comment
There was a problem hiding this comment.
post-merge ACK 67ceebb/ I was in the middle of it when the PR got closed.
Reproduced the steps detailed in the description.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 with the squashed "!fixup" commits.
Steps to reproduce:
git rebase -i --autosquash 9e1306fc886bcf8024ec37687bbfb8ae364286d6command (there is a conflict, which can be resolved by removing the.github/workflows/ci.ymlfile).