Skip to content
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

Rebased cmake-staging branch (post PRs 45 and 34) #47

Closed
wants to merge 43 commits into from

Conversation

hebasto
Copy link
Owner

@hebasto hebasto commented Nov 9, 2023

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 master command (must be no conflicts).
  2. Mirror build system changes from net: improves addnode / m_added_nodes logic bitcoin/bitcoin#28155.

hebasto and others added 30 commits November 9, 2023 18:24
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.
@hebasto
Copy link
Owner Author

hebasto commented Nov 9, 2023

Friendly ping @TheCharlatan @theuni @vasild :)

Copy link

@theuni theuni left a comment

Choose a reason for hiding this comment

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

Diff after rebase:

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 2286c849a9f..99ca6aeb10d 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -77,6 +77,7 @@ add_executable(test_bitcoin
   miniscript_tests.cpp
   minisketch_tests.cpp
   multisig_tests.cpp
+  net_peer_connection_tests.cpp
   net_peer_eviction_tests.cpp
   net_tests.cpp
   netbase_tests.cpp

Which was expected from the description.

Quick local build is ok.

ACK 7400ca5

@hebasto
Copy link
Owner Author

hebasto commented Nov 9, 2023

@theuni

Thank you for the reviewing!


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

Closing.

@hebasto hebasto closed this Nov 9, 2023
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.

2 participants