[27.x] Backports #32479

pull fanquake wants to merge 9 commits into bitcoin:27.x from fanquake:27_x_backports changing 15 files +67 −32

fanquake commented at 1:31 PM on May 13, 2025: member
Backports
- #32070
- #32187
- #32286
- #32439
- #32568

test: Handle empty string returned by CLI as None in RPC tests

Github-Pull: #32286
Rebased-From: a4041c77f0e20d004524868e70ff12508832c9eb

992c7cad46

refactor: Remove spurious virtual from final ~CZMQNotificationInterface
Github-Pull: #32187 Rebased-From: fa69c42fdf0aeec0546e951bc6132ab630edb9d4
418bee8f9d

build: use make < 3.82 syntax for define directive

From the GNU make 3.82 release announcement:

* The 'define' make directive now allows a variable assignment operator
  after the variable name, to allow for simple, conditional, or appending
  multi-line variable assignment.

macOS ships with 3.81. This caused the multiprocess config options
to be ignored.

Fixes #32068

Co-authored-by: Ryan Ofsky <ryan@ofsky.org>

Github-Pull: #32070
Rebased-From: 9157d9e449870851ef455e077249ac46fc2df24c

f52ab00f69

fanquake added this to the milestone 27.3 on May 13, 2025
DrahtBot commented at 1:31 PM on May 13, 2025: contributor


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32479.



Reviews

See the guideline for information on the review process.

Type Reviewers

ACK willcl-ark

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.



LLM Linter (✨ experimental)

Possible typos and grammar issues:
- accomodate -> accommodate [correct spelling of “accommodate”]
<sup>drahtbot_id_4_m</sup>
DrahtBot added the label Backport on May 13, 2025

Type	Reviewers
ACK	willcl-ark

fanquake commented at 2:02 PM on May 13, 2025: member

This is failing in the macOS CI. An issue with Boost Process:

 configure:34786: checking whether Boost.Process can be used
configure:34817: g++ -std=gnu++11 -std=c++20 -o conftest  -Wno-error=narrowing  -isystem /usr/local/include -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION  -pthread conftest.cpp  >&5
conftest.cpp:64:9: error: no type named 'opstream' in namespace 'boost::process'
    bp::opstream stdin_stream;
    ~~~~^
conftest.cpp:65:18: error: use of undeclared identifier 'stdout_stream'; did you mean 'stdin_stream'?
    bp::ipstream stdout_stream;
                 ^~~~~~~~~~~~~
                 stdin_stream
conftest.cpp:64:18: note: 'stdin_stream' declared here
    bp::opstream stdin_stream;
                 ^
conftest.cpp:65:17: error: expected ';' after expression
    bp::ipstream stdout_stream;

test: Add imports for util bpf_cflags

This is required for the next commit.

Github-Pull: #32336
Rebased-From: fa0c1baaf89805182de56d6a2e8eed2265a94b40

1fc7b9d260

scripted-diff: Use bpf_cflags

-BEGIN VERIFY SCRIPT-

 ren() { sed --regexp-extended -i "s/$1/$2/g" $( git grep --extended-regexp -l "$1" ) ; }

 ren 'cflags=\["-Wno-error=implicit-function-declaration"\]' 'cflags=bpf_cflags()'

-END VERIFY SCRIPT-

Github-Pull: #32336
Rebased-From: facb9b327b9da39ce1e09ed56199be9efb19b5b8

882166642c

fanquake force-pushed on May 13, 2025
DrahtBot added the label CI failed on May 13, 2025
fanquake commented at 4:54 PM on May 13, 2025: member

This is failing in the macOS CI. An issue with Boost Process:

Looks this is because Boost Process V1 compat was broken in Boost 1.88.0, https://github.com/boostorg/process/issues/480, which is the version being used in the macOS CI here, and --enable-external-signer is passed globally in the CI.

ci: remove --enable-external-signer

Boost 1.88.0 (installed in the macOS CI) broke compat with Boost Process
V1. As `--enable-external-signer` is set in the CI, this causes the
macOS CI to fail. Remove `--enable-external-signer` from the CI.

e0af7bffff

fanquake force-pushed on May 19, 2025
fanquake commented at 12:56 PM on May 19, 2025: member

I've added a commit to drop --enable-external-signer from the global CI config.
fanquake force-pushed on May 21, 2025
fanquake marked this as ready for review on May 21, 2025
fanquake commented at 11:58 AM on May 21, 2025: member

Added a note to the release notes as well.

guix: accomodate migration to codeberg

See https://guix.gnu.org/blog/2025/migrating-to-codeberg/.

When interacting with the old repo you may now also see:
```bash
warning: redirecting to https://codeberg.org/guix/guix/
```

Github-Pull: #32439
Rebased-From: d5ca4d4fd713a9f7e17e074a1e37dda99bbb09fc

a328170e09

fanquake force-pushed on May 29, 2025
fanquake requested review from willcl-ark on May 30, 2025

depends: use "mkdir -p" when installing xproto

It looks like the mkdir detection in xproto is broken on Alpine. Ensure
we always use `mkdir -p`.

Fixes #32494.

Github-Pull: #32568
Rebased-From: df9ebbf659d5d1282289f36d7f9ee7103aa33a17

aef658601d

doc: update release notes for 27.x 1d8856dddf
fanquake force-pushed on Jun 4, 2025
willcl-ark approved
willcl-ark commented at 2:22 PM on June 6, 2025: member

ACK 1d8856dddfcd6978ca8104d7c3fc96f522ad2e9b

Backports and attributions in release note appear correct.

Is my understanding correct that commit "ci: remove --enable-external-signer" e0af7bffff4b33d1de9d95bb7a4f4424f2e6c2dd is not a backport?
fanquake commented at 2:23 PM on June 6, 2025: member

That is correct.

fanquake commented at 2:39 PM on June 6, 2025: member

Guix Build:

d178e3421afcc858584bedbda3e3bce85ccc9071aa4fab8b58eda3aad9b4676f  guix-build-1d8856dddfcd/output/aarch64-linux-gnu/SHA256SUMS.part
31064b3b8268e8b8512e120c12d458788a249b733be3578cc73808bfde5a04f4  guix-build-1d8856dddfcd/output/aarch64-linux-gnu/bitcoin-1d8856dddfcd-aarch64-linux-gnu-debug.tar.gz
58d34149465cf68e3cf2c3b6b96ba625ec4df4b5aaeccc48597588b83c4e6ed8  guix-build-1d8856dddfcd/output/aarch64-linux-gnu/bitcoin-1d8856dddfcd-aarch64-linux-gnu.tar.gz
23b8d8759f407086878d909104bc9d86e8f35c39c81de1a7eaf0cceab9c4061e  guix-build-1d8856dddfcd/output/arm-linux-gnueabihf/SHA256SUMS.part
1503ec1aef2683af68d4070c4fd9d5920785ac0dfd24b850375738a5312a0f6d  guix-build-1d8856dddfcd/output/arm-linux-gnueabihf/bitcoin-1d8856dddfcd-arm-linux-gnueabihf-debug.tar.gz
2003a72943c8c1104d6b9e0391e29e838cd684fae3b9b30faa894f80da6c03aa  guix-build-1d8856dddfcd/output/arm-linux-gnueabihf/bitcoin-1d8856dddfcd-arm-linux-gnueabihf.tar.gz
6ea37b6d4043a063a24c773a2682f041c7b6dc1d58df725ad6ac268c9ee403b4  guix-build-1d8856dddfcd/output/arm64-apple-darwin/SHA256SUMS.part
30c8bba72d34859be7aa175601a3fe45c3dd2b0d0977cde70063fbb113017165  guix-build-1d8856dddfcd/output/arm64-apple-darwin/bitcoin-1d8856dddfcd-arm64-apple-darwin-unsigned.tar.gz
3396f77e96e027bdee263608d6b84541189edaa02cae5e6e0e18ae1c2bb44f42  guix-build-1d8856dddfcd/output/arm64-apple-darwin/bitcoin-1d8856dddfcd-arm64-apple-darwin-unsigned.zip
8d006e800c042e4d6a233388cc848c21ea64f264d283df17d197528cd321c4ed  guix-build-1d8856dddfcd/output/arm64-apple-darwin/bitcoin-1d8856dddfcd-arm64-apple-darwin.tar.gz
bacc6282fd85c51d1b537bc1214ad9b4b0b252dba05df6bf281cc43583b55bcd  guix-build-1d8856dddfcd/output/dist-archive/bitcoin-1d8856dddfcd.tar.gz
907cc967ffce96061d3075beddb34a2cbd1066f892f3efa469143501e3b4425e  guix-build-1d8856dddfcd/output/powerpc64-linux-gnu/SHA256SUMS.part
ea9586fbd4a55ac923539404a8f78b83ac70f5ec8710a167d83030c6d8b87e81  guix-build-1d8856dddfcd/output/powerpc64-linux-gnu/bitcoin-1d8856dddfcd-powerpc64-linux-gnu-debug.tar.gz
ef824279e27db19ec6ed658a94665cbf54787f580b2def3290a33eeec7431a13  guix-build-1d8856dddfcd/output/powerpc64-linux-gnu/bitcoin-1d8856dddfcd-powerpc64-linux-gnu.tar.gz
38a1c3affe90842d2753cd51af30d03729ca701f2e4dbc0d22b8abb23f8ccf94  guix-build-1d8856dddfcd/output/powerpc64le-linux-gnu/SHA256SUMS.part
2ba1fe34d255eef472aa74bba09846523902216ceb9799791d21f21e96569ee8  guix-build-1d8856dddfcd/output/powerpc64le-linux-gnu/bitcoin-1d8856dddfcd-powerpc64le-linux-gnu-debug.tar.gz
c9c1379555a8531136ce4c0c66ee4ed38c901ae50ed18056883dd4f966d4414d  guix-build-1d8856dddfcd/output/powerpc64le-linux-gnu/bitcoin-1d8856dddfcd-powerpc64le-linux-gnu.tar.gz
756dc06d97d3fc20fa410388e561de3fa93d2fd94d9114fb74b4227eaa8fccbc  guix-build-1d8856dddfcd/output/riscv64-linux-gnu/SHA256SUMS.part
96cfb2985d5ecb96b93867b1d7e1bbf833af67538e552c7fd211c962e4e1d8e8  guix-build-1d8856dddfcd/output/riscv64-linux-gnu/bitcoin-1d8856dddfcd-riscv64-linux-gnu-debug.tar.gz
c47032969cae8fe910eda753081391caa603764baacad7f9c09c08f1c6c74736  guix-build-1d8856dddfcd/output/riscv64-linux-gnu/bitcoin-1d8856dddfcd-riscv64-linux-gnu.tar.gz
7df9054e4985b19f04369a2a505258598dc21382dc0a1b1d1947fd8a6565589d  guix-build-1d8856dddfcd/output/x86_64-apple-darwin/SHA256SUMS.part
5b7d59824261edbcc5b8da75cb55f730fed05d5c23b3aa71f0efd014210fc562  guix-build-1d8856dddfcd/output/x86_64-apple-darwin/bitcoin-1d8856dddfcd-x86_64-apple-darwin-unsigned.tar.gz
d4527781f45775cd3e3ed22786199eed8617eca3650e13eff3e37063220d914b  guix-build-1d8856dddfcd/output/x86_64-apple-darwin/bitcoin-1d8856dddfcd-x86_64-apple-darwin-unsigned.zip
abba3e53094cd69474a330501d21ff59f0863252b7681ddf56815cb3c1b1ad80  guix-build-1d8856dddfcd/output/x86_64-apple-darwin/bitcoin-1d8856dddfcd-x86_64-apple-darwin.tar.gz
04a70a9c034767f4cacd932914c575c144212440cdc57b2dc0a461d06f6df772  guix-build-1d8856dddfcd/output/x86_64-linux-gnu/SHA256SUMS.part
3f6bf3ea6abb17a01d835140591fc9668df501a12a5e7a0849c66388bd359f55  guix-build-1d8856dddfcd/output/x86_64-linux-gnu/bitcoin-1d8856dddfcd-x86_64-linux-gnu-debug.tar.gz
91cb989ab182c9e320d504c7b42cf59235a02759bec3f8816cbedfa8f9c8a3e7  guix-build-1d8856dddfcd/output/x86_64-linux-gnu/bitcoin-1d8856dddfcd-x86_64-linux-gnu.tar.gz
f4ada77b53d1ae98d602b3dc42180b5e7a2084adf7069c6f3c81351075a6c884  guix-build-1d8856dddfcd/output/x86_64-w64-mingw32/SHA256SUMS.part
4e0e1d6c41e8d256e7139ea0443ab1143302268e155dab5c13ea60924c0c7e43  guix-build-1d8856dddfcd/output/x86_64-w64-mingw32/bitcoin-1d8856dddfcd-win64-debug.zip
39df55dd4dff0ad451615d08f7fa74006ee4286be6691beff5e827446eb5f0bb  guix-build-1d8856dddfcd/output/x86_64-w64-mingw32/bitcoin-1d8856dddfcd-win64-setup-unsigned.exe
c70e31b182af00671e69b63854c2e8ccc3430d654776384269f307f798f17c07  guix-build-1d8856dddfcd/output/x86_64-w64-mingw32/bitcoin-1d8856dddfcd-win64-unsigned.tar.gz
cc6877d136bb2f0814de3ec5b32966a0f286b41db13d0bd77a421df73eb81126  guix-build-1d8856dddfcd/output/x86_64-w64-mingw32/bitcoin-1d8856dddfcd-win64.zip

fanquake merged this on Jun 9, 2025
fanquake closed this on Jun 9, 2025
fanquake deleted the branch on Jun 9, 2025
morozow referenced this in commit c0a637fe80 on May 8, 2026
bitcoin locked this on Jul 30, 2026

Contributors

Labels

Milestone
27.3

Linked (view graph)

#32070 build: use make < 3.82 syntax for define directive #32187 refactor: Remove spurious virtual from final ~CZMQNotificationInterface #32286 test: Handle empty string returned by CLI as None in RPC tests #32439 guix: accomodate migration to codeberg #32568 depends: use "mkdir -p" when installing xproto

[27.x] Backports #32479

Code Coverage & Benchmarks

Reviews

LLM Linter (✨ experimental)