Rebased cmake-staging branch

[hebasto]

This is the cmake-staging branch rebased on the recent bitcoin/master one which includes recent changes into the current Autotools-based build system.

Easy to verify using:

git range-diff master 9c83f078442e2329ec551af3d3525e82aad880fa 16b6c2fc3f8c97818fe2e23481affbc5ac53ffd6

More context:

• build: Add CMake-based build system (1 of N) bitcoin/bitcoin#27060 (comment)
• build: Add CMake-based build system (3 of N) #7 (comment)
• build: Add CMake-based build system (3 of N) #7 (comment)

[hebasto]

@fanquake @TheCharlatan @theuni @vasild

Are you OK with force pushing this branch into the staging one?

[vasild]

ACK 16b6c2f

I did not anticipate this would have to be done occasionally. Verified with:

git range-diff hebasto/cmake-staging...hebasto/230223-linear

In the commit messages:

Github-Pull: hebasto/bitcoin#5
Rebased-From: bc25ddae3e0f3f1739e1f131ad480c0d044cf7c4

if these are to make it to bitcoin/master: I think Github-Pull: may have some value, but Rebased-From: would be just clutter because that commit will be lost eventually.

[theuni]

Sure. I think there will be 3 cases here:

1. Upstream has changed in a way that doesn't affect us at all.
2. Upstream has changed in a way that doesn't affect us here yet but will later
3. Upstream has changed in a way that requires us to rework the current commits.

With a bonus modifier:
a. git collisions
b. no git collisions

For 1, obviously we just hold off and do nothing.

In this case because we're pretty much only working on new files and we haven't yet implemented the libs for what's changed upstream, it's 2a.

That means a clean diff of the files we've touched so far (which is true):

git diff hebasto/cmake-staging..hebasto/pr/8 -- `git diff --name-only 5ecd14a31c..hebasto/cmake-staging`

and a set of upstream changes that don't affect us (also true, quick approx of buildsystem files):

 $ git diff -U1 hebasto/cmake-staging..hebasto/pr/8 -- configure.ac `git ls-files | grep Makefile`

diff --git a/configure.ac b/configure.ac
index 0f809169fc..72503f2b1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -966 +966 @@ if test "$use_hardening" != "no"; then
-    AX_CHECK_PREPROC_FLAG([-D_FORTIFY_SOURCE=2],[
+    AX_CHECK_PREPROC_FLAG([-D_FORTIFY_SOURCE=3],[
@@ -970 +970 @@ if test "$use_hardening" != "no"; then
-      HARDENED_CPPFLAGS="$HARDENED_CPPFLAGS -D_FORTIFY_SOURCE=2"
+      HARDENED_CPPFLAGS="$HARDENED_CPPFLAGS -D_FORTIFY_SOURCE=3"
diff --git a/src/Makefile.am b/src/Makefile.am
index 5830090ada..7b9ffe427d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -206,0 +207 @@ BITCOIN_CORE_H = \
+  node/coins_view_args.h \
@@ -208,0 +210 @@ BITCOIN_CORE_H = \
+  node/database_args.h \
@@ -390,0 +393 @@ libbitcoin_node_a_SOURCES = \
+  node/coins_view_args.cpp \
@@ -392,0 +396 @@ libbitcoin_node_a_SOURCES = \
+  node/database_args.cpp \
diff --git a/src/Makefile.test_util.include b/src/Makefile.test_util.include
index ae77b79b8b..aefefe789a 100644
--- a/src/Makefile.test_util.include
+++ b/src/Makefile.test_util.include
@@ -12,0 +13 @@ TEST_UTIL_H = \
+  test/util/coins.h \
@@ -16,0 +18 @@ TEST_UTIL_H = \
+  test/util/random.h \
@@ -32,0 +35 @@ libtest_util_a_SOURCES = \
+  test/util/coins.cpp \

We haven't implemented node or tests or hardening yet, so there's nothing to go back and fixup.

ACK 16b6c2f

I think this is fine to do every now and then. Please give us warning next time though so we don't end up in limbo reviewing different bases in different PRs.

[hebasto]

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

Closing.