Repository navigation
backport: v0.27 bitcoin#28755, bitcoin#29195, bitcoin#29218, bitcoin#29251 - #114
Open
DCG-Claude wants to merge 4 commits into
Open
DCG-Claude wants to merge 4 commits into
DCG-Claude wants to merge 4 commits into
Conversation
Potential PR merge conflictsThis is advisory only. It does not block CI, but it marks PRs that will likely need a rebase depending on merge order. If this PR merges firstThese open PRs will likely need a rebase:
If these PRs merge firstThis PR will likely need a rebase:
|
3 tasks
DCG-Claude
changed the title
b74e449 build: remove potential for duplciate natpmp linking (fanquake) 4e95096 build: remove duplicate -lminiupnpc linking (fanquake) Pull request description: Having the link check in the header check loop means we get `-lminiupnpc -lminiupnpc -lminiupnpc` on the link line. This is unnecessary, and results in warnings, i.e: ```bash ld: warning: ignoring duplicate libraries: '-levent', '-lminiupnpc' ld: warning: ignoring duplicate libraries: '-levent', '-lminiupnpc' ld: warning: ignoring duplicate libraries: '-levent', '-lminiupnpc' ``` These warnings have been occurring since the new macOS linker released with Xcode 15, and also came up in hebasto#34. There are other duplicate lib issues, i.e with `-levent` + `-levent_pthreads -levent`, but those are less straight forward to solve, and won't be included here. ACKs for top commit: jonatack: ACK b74e449 hebasto: ACK b74e449, it fixes one issue mentioned in hebasto#34 (comment). TheCharlatan: ACK b74e449 theuni: ACK b74e449 Tree-SHA512: 987a56ef17cbaf273cb672c41016f3f615b16889317325a9e88135d0c41f01af3840ad44a6f811a7df97f5873c9cd957e60aaa1b99bd408b17b4b1ffe2c68f36
d742be3 ci: Switch native macOS CI job to Xcode 15.0 (Hennadii Stepanov) 8decc5c build: Fix `-Xclang -internal-isystem` option (Hennadii Stepanov) Pull request description: This PR: - addresses bitcoin#29165 (comment) - fixes bitcoin#29174 ACKs for top commit: fanquake: ACK d742be3. The same as what was done in bitcoin#27328. Tree-SHA512: 4788a0511e9fac638edab8e4f7ec62c5e08aeb07e518ab62fd53074ab3dd4eca1f62dc17c2af2b535bad12e77a7437e5c1c714cd03ce711e5d5e5c87d4620358 Dash adaptations: - .github/workflows/ci.yml: upstream's Xcode 15.0 switch in the native macOS job is not taken; Dash has no native macOS CI job, so there is nowhere to apply it. Not applicable to Dash (intentionally omitted): - .github/workflows/ci.yml: Dash replaced ci.yml with its own workflows, which have no native macOS job (darwin is cross-compiled on Linux), so the xcode-select switch has no counterpart.
fa0c594 ci: Rename tasks (previous releases, macOS cross) (MarcoFalke) Pull request description: The previous releases task no longer uses the qt5 dev package, but the depends package, so fix that in the name. Also, remove a detail from the macOS cross task name, because anyone can look it up in the source, if they really want to. Otherwise, it may go out of date in the name. Also, rename the two tasks' config file to reflect the same. ACKs for top commit: fanquake: ACK fa0c594 Tree-SHA512: e6f1d04128d35462c49367c98a0227988695d75add88c569804551e3fd30c22292d22b88fa19c54f02fab0c9784c77a078447de0280553a3fc7162dcf992d7ae Dash adaptations: - ci/test/00_setup_env_native_previous_releases.sh: keeps Dash's own body of the renamed qt5 script; only upstream's CONTAINER_NAME rename is applied - ci/dash/matrix.sh: linux64 and mac targets now source the renamed 00_setup_env_native_previous_releases.sh and 00_setup_env_mac_cross.sh - .github/workflows/test-src.yml: previous-releases cache key hashes the renamed 00_setup_env_native_previous_releases.sh - .cirrus.yml: Cirrus task renames dropped; Dash runs these jobs through GitHub Actions + ci/dash/matrix.sh, which take the file renames instead Not applicable to Dash (intentionally omitted): - .cirrus.yml: Dash has no Cirrus CI; its counterpart (ci/dash/matrix.sh, .github/workflows/test-src.yml) is updated for the renamed files instead
52149b7 contrib: Fix clang-format-diff.py lint errors (TheCharlatan) 008e81e contrib: Latest clang-format-diff.py script (TheCharlatan) Pull request description: This was taken from https://github.com/llvm/llvm-project/blob/900bb318b5b8c485e57cf810253a656b0fb683bc/clang/tools/clang-format/clang-format-diff.py and is useful for systems where clang tools are shipped with a version suffix. ACKs for top commit: maflcko: lgtm ACK 52149b7 🌱 Tree-SHA512: cad720b283650e36c5b3ec597278112899ae6413a42c79b6296c58242000f32ae6ab7ed732a3a0f30f1f2586d7e3c0d1ef856a4821e28272bae6f428ed9497e9
DCG-Claude
force-pushed
the
backport-0.27-b002-other
branch
from
October 22, 2026 06:30
ff50fd1 to
48c97f5
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated Bitcoin Core v0.27 backports, batch
backport-0.27-b002-other.82b7a2fe3d76319319a3-Xclangbefore both-internal-isystemand its/usr/local/include/argum1865d183a348c97f56a0Provenance
Each commit passed: cherry-pick (adapted by an Opus lane only where conflicts existed), build, touched tests, a mechanical diff-of-diffs check (every upstream hunk landed; no added line without an upstream counterpart), and an independent Opus verification lane where anything was adapted. Gate rows and lane artifacts are in the backportsys DB.