Rebased cmake-staging branch (post PRs 33, 37)

[hebasto]

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

Testing instructions are the same as for #31:

• Rebased cmake-staging branch (post PRs 17, 18, 19) #31 (comment)
• Rebased cmake-staging branch (post PRs 17, 18, 19) #31 (comment) (except for Debian 10 with CMake 3.13)

---

A note for reviewers:

First, the git rebase -i --autosquash master command was applied:
cmake-staging/pr38-init -- > cmake-staging/pr38-autosquash

Then, the recent changes in the build system in the master branch were applied:
cmake-staging/pr38-autosquash --> this PR branch

[hebasto]

Many thanks to @TheCharlatan who suggested to leverage the "fixup/autosquash" git functionality!

[hebasto]

Friendly ping @fanquake @theuni @TheCharlatan @luke-jr @willcl-ark @stickies-v @ajtowns @w0xlt @pablomartin4btc @vasild

The plan is to continue the work on #32 on top of this updated staging branch.

[theuni]

For whatever reason, I had to move the "fixup! cmake: Add position independent code support" down to after the "add bitcoind" commit in order for the rebase to work. Maybe some config option difference for handling merge order or something?

After that, following along, the diff from this PR to what I generated with my rebase:

 $ git diff HEAD..hebasto/231024-linear
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a5e9dcc66..10b484bebd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
 cmake_minimum_required(VERSION 3.16...3.28)

 project("Bitcoin Core"
-  VERSION 25.99.0
+  VERSION 26.99.0
   DESCRIPTION "Bitcoin client software"
   HOMEPAGE_URL "https://bitcoincore.org/"
   LANGUAGES CXX ASM
@@ -232,7 +232,7 @@ endif()

 include(cmake/optional.cmake)

-find_package(Python3 3.8 COMPONENTS Interpreter)
+find_package(Python3 3.9 COMPONENTS Interpreter)
 set(PYTHON_COMMAND ${Python3_EXECUTABLE})

 add_subdirectory(src)
diff --git a/src/bench/CMakeLists.txt b/src/bench/CMakeLists.txt
index feec7290b1..3e9b144c77 100644
--- a/src/bench/CMakeLists.txt
+++ b/src/bench/CMakeLists.txt
@@ -23,6 +23,7 @@ add_executable(bench_bitcoin
   checkqueue.cpp
   crypto_hash.cpp
   descriptors.cpp
+  disconnected_transactions.cpp
   duplicate_inputs.cpp
   ellswift.cpp
   examples.cpp

The version bump is obvious.
The python bump is from: bitcoin#28211
The additional cpp is from: bitcoin#28385

[theuni]

-fstack-reuse=none is the other thing that I can think of that would need to be addressed in a recent buildsystem rebase, but those options come in #32.

LGTM. I'm curious if other reviewers have the same issue reproducing the rebase?

[vasild]

LGTM

I got the same experience as in #38 (comment) and produced the same diff.

The change from commit 1246971 fixup! cmake: Add position independent code support is properly squashed in fc85336 cmake: Add position independent code support in this PR (branch 231024-linear), not like in my local rebase where I moved it into 6bf981a cmake: Build bitcoind executable to avoid a conflict.

[hebasto]

@theuni @vasild

Thank you for the reviewing!

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

Closing.