Backports:
[29.x] Backports #34855
pull fanquake wants to merge 3 commits into bitcoin:29.x from fanquake:more_29_x_backports changing 6 files +28 −22-
fanquake commented at 6:46 AM on March 19, 2026: member
-
0fb5e167e8
cmake: Migrate away from deprecated SQLite3 target
CMake version 4.3 deprecated the imported target `Sqlite::Sqlite3`. Use the preferred name `Sqlite3::Sqlite3` instead and provide an alias for older versions of CMake. Also define the same alias when using vcpkg. Github-Pull: #34848 Rebased-From: 498b6eb6b5e8aceb372d3097df2715d9c7fc416b
- fanquake added this to the milestone 29.4 on Mar 19, 2026
- DrahtBot added the label Backport on Mar 19, 2026
-
DrahtBot commented at 6:46 AM on March 19, 2026: contributor
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--021abf342d371248e50ceaed478a90ca-->
Reviews
See the guideline for information on the review process.
Type Reviewers ACK willcl-ark If your review is incorrectly listed, please copy-paste <code><!--meta-tag:bot-skip--></code> into the comment that the bot should ignore.
<!--5faf32d7da4f0f540f40219e4f7537a3-->
- fanquake force-pushed on Apr 30, 2026
- fanquake marked this as ready for review on Apr 30, 2026
-
willcl-ark commented at 1:29 PM on April 30, 2026: member
in 76e63c36dc524da8682b8b18d07ce78d027122a4, do we need to also update https://github.com/bitcoin/bitcoin/blob/76e63c36dc524da8682b8b18d07ce78d027122a4/src/node/miner.h#L105-L118 ?
CI seems happy, but I think that's because we are boost 1.81 in depends here.
Suspect this may want to be inlined into the
boost::multi_index_containeras per the rest of the commit. I'm running 1.89 here only so didn't test with >= 1.91 (and nixpkgs unstable only has 1.89 currently) -
546598b736
multi_index: fix compilation failure with boost >= 1.91
This effectively reverts a3cb309e7c31853f272bffaa65fb6ab0a7cc4083 from PR #30194. That PR reduced the multi_index type signatures as recommended upstream, but this is no longer supported as of boost 1.91 because it is no longer necessary. 1.91 drops support for the pre-c++11 work-arounds that bloated the type signatures to begin with. The upstream `BOOST_MULTI_INDEX_ENABLE_MPL_SUPPORT` define is meant to provide compatibility with removed features, but it does not work for this case. Using `indexed_by` directly when defining the `multi_index` (as opposed to inheriting from it) works with all versions, and avoids the use of the back-compat define. This is a slight regression when building against boost < 1.91 because the bloated type signatures are reintroduced in that case, but it's not significant enough to go to the trouble of introducing version detection and ifdefs. Github-Pull: #35175 Rebased-From: 0bc9d354dfd8074d1c36a891a69b6585a8775c65
-
doc: update release notes for v29.x 4e7a990148
- fanquake force-pushed on Apr 30, 2026
- willcl-ark approved
-
willcl-ark commented at 8:34 PM on April 30, 2026: member
utACK 4e7a990148d47cf129c245bc17d0f228eb06a3e6
This looks correct to me now, though I didn't test myself with boost 1.91+
Milestone
29.4