Skip to content

cmake: Regular rebasing of the cmake-staging branch #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 48 commits into from

Conversation

hebasto
Copy link
Owner

@hebasto hebasto commented Jan 9, 2024

This is the cmake-staging branch rebased on the recent bitcoin/master one with the squashed "!fixup" commits.

Steps to reproduce:

  1. Apply the git rebase -i --autosquash 9e1306fc886bcf8024ec37687bbfb8ae364286d6 command (there is a conflict, which can be resolved by removing the .github/workflows/ci.yml file).
  2. Backport changes from the following PRs:

hebasto and others added 30 commits January 9, 2024 14:21
Co-authored-by: Cory Fields <[email protected]>
Co-authored-by: Vasil Dimov <[email protected]>
To configure CMake for cross-compiling, use
`--toolchain depends/${HOST}/share/toolchain.cmake` command-line option.
@hebasto
Copy link
Owner Author

hebasto commented Jan 9, 2024

Friendly ping @vasild @TheCharlatan @theuni @pablomartin4btc @m3dwards :)

@hebasto
Copy link
Owner Author

hebasto commented Jan 9, 2024

CI looks green :)

The plan is to process #72 after approving this PR.

Copy link

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 67ceebb

@hebasto
Copy link
Owner Author

hebasto commented Jan 9, 2024

@TheCharlatan

Thank you for your review!


This branch has been force pushed into the https://github.com/hebasto/bitcoin/tree/cmake-staging.

Closing.

@hebasto hebasto closed this Jan 9, 2024
Copy link

@pablomartin4btc pablomartin4btc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

post-merge ACK 67ceebb/ I was in the middle of it when the PR got closed.

Reproduced the steps detailed in the description.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants