build: use make < 3.82 syntax for define directive #32070
Merged
Conversation
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
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code Coverage & BenchmarksFor details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32070. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
1 task
|
We don't seem to specify a minimum make version? |
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 bitcoin#32068 Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
db06626 to
9157d9e
Compare
ryanofsky
approved these changes
Mar 14, 2025
There was a problem hiding this comment.
Code review ACK 9157d9e. This is a pretty unusual bug and I don't understand how it wasn't causing any errors with make 3.81, just causing the flags to be ignored.
(Another case where there was a problem with make 3.81 was bitcoin-core/libmultiprocess#139 / #31741 (comment))
I probably haven't recently used the depends build to test multiprocess on my development machine. I would either use my locally install And macOS native CI doesn't build depends with multiprocess. |
In light of silent failures, it would be better to rule out this class of bug completely. Otherwise, a new instance will be added in the future, or will already exist somewhere in the code. I am not sure why reviewers should spend time on supporting build tools that were released about 20 years ago. So rejecting such a build tool early with a failure seems more appropriate and will likely save developer, reviewer and user time debugging silent failures. |
|
@maflcko I'm fine with introducing a minimum GNU make version, as long as we actually check the version (otherwise we're back to silent failures). But note that I run the stock macOS GNU make all the time, as do many other devs. So new issues are likely to be caught during review, though they'll still waste time debugging. |
|
(unrelated to the make issue, the same conceptual problem exists for the macOS bash version, but I guess the bash version check would be even harder to achieve and is only reliably avoidable by not writing bash code) |
glozow
pushed a commit
to glozow/bitcoin
that referenced
this pull request
Mar 17, 2025
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 bitcoin#32068 Github-Pull: bitcoin#32070 Rebased-From: 9157d9e Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
|
Backported in #32062 |
FWIW, the stock macOS Make has other issues. |
|
Is there a way we can pick up a modern homebrew version of make without forcing macOS devs and users to change their default make? (and without the use of env variables) |
I imagine something like that: |
|
Proposed in #32086. |
fanquake
added a commit
that referenced
this pull request
Mar 18, 2025
74df31c [doc] update example bitcoin.conf with missing options (glozow) 8082f88 [doc] update man pages for 29.0rc2 (glozow) 472d582 [build] bump to 29.0rc2 (glozow) a4c30bd qt: doc: adapt outdated binary paths to CMake changes (Sebastian Falbesoner) 4e438d3 build: use make < 3.82 syntax for define directive (Sjors Provoost) 7ff0b02 build: Remove manpages when making MacOS app (Ava Chow) 5ebcb59 test: fix intermittent failure in p2p_orphan_handling.py (Martin Zumsande) 458655b fuzz: make sure DecodeBase58(Check) is called with valid values more often (Lőrinc) 15ecae3 fuzz: Always restrict base conversion input lengths (Lőrinc) 80c5d57 contrib: Fix `gen-bitcoin-conf.sh`. (David Gumberg) Pull request description: backports: - #32049 - #32063 - #32064 - #32070 - #31917 ACKs for top commit: Sjors: ACK 74df31c hebasto: ACK 74df31c, I have reviewed the code and it looks OK. ismaelsadeeq: Code review ACK 74df31c Tree-SHA512: df4ef832a03c9c3f89d30d3f65d81b7c7e4793d2cad8a269f1ff221454a4b0b05e06109f4556926c1c4f7fcbd2537052b4d58b4b3911dfcfc35726c600b587d9
stickies-v
added a commit
to stickies-v/py-bitcoinkernel
that referenced
this pull request
Mar 21, 2025
29f05b91cf8 kernel: Add pure kernel bitcoin-chainstate b7733085a90 kernel: Add functions to get the block hash from a block a4f79616064 kernel: Add block index utility functions to C header 0a0062b85a7 kernel: Add function to read block undo data from disk to C header e49808a42d3 kernel: Add functions to read block from disk to C header 2f54bd53745 kernel: Add function for copying block data to C header c34ecbefbd8 kernel: Add functions for the block validation state to C header 0b46337ebe3 kernel: Add validation interface to C header 4c7a81a030e kernel: Add interrupt function to C header edf1d56fc05 kernel: Add import blocks function to C header 894b9c20447 kernel: Add chainstate load options for in-memory dbs in C header 157de0eccd3 kernel: Add options for reindexing in C header bdff17958b1 kernel: Add block validation to C header c52ca9447fc kernel: Add chainstate loading when instantiating a ChainstateManager 031a96dc6b7 kernel: Add chainstate manager option for setting worker threads c2f03a11251 kernel: Add chainstate manager object to C header 18ec1cc195b kernel: Add notifications context option to C header e3b03745f93 kernel: Add chain params context option to C header ef426234c07 kernel: Add kernel library context object 2c5e6b55922 kernel: Add logging to kernel library C header 20f1f67de07 kernel: Introduce initial kernel C header API 998386d4462 Merge bitcoin/bitcoin#31866: test, refactor: Add TestNode.binaries to hold binary paths aa87e0b4460 Merge bitcoin/bitcoin#31519: refactor: Use std::span over Span ef525e8b7c1 Merge bitcoin/bitcoin#31457: fuzz: Speed up *_package_eval fuzz targets a bit 7d76c9725ca Merge bitcoin/bitcoin#31766: leveldb: pull upstream C++23 changes 780bcf80b5d Merge bitcoin/bitcoin#32091: test: replace assert with assert_equal and assert_greater_than e568c1dd134 Merge bitcoin/bitcoin#32088: test: switch wallet_crosschain.py to signet and drop testnet4 e8f6a48e310 Merge bitcoin/bitcoin#32057: test: avoid disk space warning for non-regtest 387385ba1ed test: replace assert with assert_equal and assert_greater_than d190f0facc8 test, contrib: Fix signer/miner command line escaping 223fc24c4eb Merge bitcoin/bitcoin#31603: descriptor: check whitespace in keys within fragments 0d2eefca8bf test, refactor: Add TestNode.binaries to hold binary paths d61a847af0b Merge bitcoin/bitcoin#32019: cmake: Check for `makensis` and `zip` tools before using them for optional `deploy` targets cec14ee47d7 test: switch wallet_crosschain.py to signet 9c2951541c2 test: drop testnet4 from wallet_crosschain.py 14fec6380dd Merge bitcoin/bitcoin#32059: test: Update coverage.cpp to drop linux restriction ece0b41da6d Merge bitcoin/bitcoin#32087: ci: Drop ENABLE_HARDENING=OFF from clang-tidy c9b633d1190 Merge bitcoin/bitcoin#31948: ci: [lint] Use Cirrus dockerfile cache 6245c235046 Merge bitcoin/bitcoin#32083: doc: shallow clone `qa-assets` 257fd27e4bb Merge bitcoin/bitcoin#32033: test: Check datadir cleanup after assumeutxo was successful 6f9f415a4fa doc: shallow clone qa-assets db2c57ae9ee Merge bitcoin-core/gui#858: qt: doc: adapt outdated binary paths to C 8000 Make changes c8fab356171 ci: remove -Wno-error=deprecated-declarations from ASAN 24fd0235e45 Update leveldb subtree to latest upstream a130bbd154d Squashed 'src/leveldb/' changes from 04b5790928..4188247086 a799415d84d Merge bitcoin/bitcoin#31904: refactor: modernize outdated trait patterns using helper aliases (C++14/C++17) 5f4422d68dc Merge bitcoin/bitcoin#32010: qa: Fix TxIndex race conditions 52482cb2440 test: Check datadir cleanup after assumeutxo was successful 7ebc458a8cb qt: doc: adapt outdated binary paths to CMake changes cd8089c20ba Merge bitcoin/bitcoin#32069: test: fix intermittent failure in wallet_reorgsrestore.py 70a0ee89c67 Merge bitcoin/bitcoin#32063: test: fix intermittent failure in p2p_orphan_handling.py 54e6eacc1fc test: Enable ResetCoverageCounters beyond Linux 83a9e55ae16 Merge bitcoin/bitcoin#32070: build: use make < 3.82 syntax for define directive ca05b28710a Merge bitcoin/bitcoin#31859: test: Rename send_message to send_without_ping ab2df1726ed Merge bitcoin/bitcoin#31917: fuzz: provide more realistic values to the base58(check) decoders 51a20e56c2f Merge bitcoin/bitcoin#31977: test: Use rpc_deprecated only for testing deprecation fac3d93c2ba fuzz: Speed up *_package_eval fuzz targets a bit fa40fd043ab fuzz: [refactor] Avoid confusing c-style cast 20fe41e9e83 test: avoid disk space warning for non-regtest 2819c514825 test: Use rpc_deprecated only for testing deprecation 7d34c19853e ci: Drop ENABLE_HARDENING=OFF from clang-tidy 9157d9e4498 build: use make < 3.82 syntax for define directive 36b0713edc4 test: fix intermittent failure in wallet_reorgsrestore.py fa9cf38ab66 scripted-diff: test: Rename send_message to send_without_ping fa4356717d6 test: Prefer send_and_ping over send_message+sync_with_ping 02942056fd8 test: fix intermittent failure in p2p_orphan_handling.py 1f9b2e150ce cmake: Require `zip` only for `deploy` target 0aeff299513 cmake: Check for `makensis` tool before using it fa3b4427158 ci: Use Cirrus dockerfile cache ffff4a293ad bench: Update span-serialize comment fa4d6ec97bc refactor: Avoid false-positive gcc warning fa942332b40 scripted-diff: Bump copyright headers after std::span changes fa0c6b7179c refactor: Remove unused Span alias fade0b5e5e6 scripted-diff: Use std::span over Span fadccc26c03 refactor: Make Span an alias of std::span fa27e36717e test: Fix broken span_tests fadf02ef8bf refactor: Return std::span from MakeUCharSpan fa720b94be1 refactor: Return std::span from MakeByteSpan 3301d2cbe8c qa: Wait for txindex to avoid race condition 9bfb0d75ba1 qa: Remove unnecessary -txindex args 7ac281c19cd qa: Add missing coverage of corrupt indexes d5537c18a90 fuzz: make sure DecodeBase58(Check) is called with valid values more often bad1433ef2b fuzz: Always restrict base conversion input lengths 21e9d39a372 docs: add release notes for 31603 a8b548d75d9 test: `getdescriptorinfo`/`importdescriptors` with whitespace in pubkeys c7afca3d62c test: descriptor: check whitespace into keys cb722a3cea1 descriptor: check whitespace in ParsePubkeyInner 4cd95a29218 refactor: modernize remaining outdated trait patterns ab2b67fce20 scripted-diff: modernize outdated trait patterns - values 8327889f358 scripted-diff: modernize outdated trait patterns - types 50856695ef6 test: fix descriptors in `ismine_tests` REVERT: 2dc27e2860b kernel: Add pure kernel bitcoin-chainstate REVERT: 338126c048f kernel: Add functions to get the block hash from a block REVERT: 56345a77968 kernel: Add block index utility functions to C header REVERT: 9530f65d19b kernel: Add function to read block undo data from disk to C header REVERT: f63860169fb kernel: Add functions to read block from disk to C header REVERT: f3aa1f9bf0c kernel: Add function for copying block data to C header REVERT: a70be77c908 kernel: Add functions for the block validation state to C header REVERT: e4e3dc585a3 kernel: Add validation interface to C header REVERT: d3c48b2bdc6 kernel: Add interrupt function to C header REVERT: 7afbc516054 kernel: Add import blocks function to C header REVERT: bad89c8b30b kernel: Add chainstate load options for in-memory dbs in C header REVERT: 1dcedf3da97 kernel: Add options for reindexing in C header REVERT: aeb68c7f022 kernel: Add block validation to C header REVERT: 99136eb1656 kernel: Add chainstate loading when instantiating a ChainstateManager REVERT: 0a2117ed501 kernel: Add chainstate manager option for setting worker threads REVERT: 599dc235e98 kernel: Add chainstate manager object to C header REVERT: f280a5f3ab8 kernel: Add notifications context option to C header REVERT: 6701d12b017 kernel: Add chain params context option to C header REVERT: f40f037a9cd kernel: Add kernel library context object REVERT: 7a6c5c7abf2 kernel: Add logging to kernel library C header REVERT: 4d663446de1 kernel: Introduce initial kernel C header API git-subtree-dir: depend/bitcoin git-subtree-split: 29f05b91cf8a479e403b0322afeb5ff1133da221
stickies-v
added a commit
to stickies-v/py-bitcoinkernel
that referenced
this pull request
Mar 21, 2025
29f05b91cf8 kernel: Add pure kernel bitcoin-chainstate b7733085a90 kernel: Add functions to get the block hash from a block a4f79616064 kernel: Add block index utility functions to C header 0a0062b85a7 kernel: Add function to read block undo data from disk to C header e49808a42d3 kernel: Add functions to read block from disk to C header 2f54bd53745 kernel: Add function for copying block data to C header c34ecbefbd8 kernel: Add functions for the block validation state to C header 0b46337ebe3 kernel: Add validation interface to C header 4c7a81a030e kernel: Add interrupt function to C header edf1d56fc05 kernel: Add import blocks function to C header 894b9c20447 kernel: Add chainstate load options for in-memory dbs in C header 157de0eccd3 kernel: Add options for reindexing in C header bdff17958b1 kernel: Add block validation to C header c52ca9447fc kernel: Add chainstate loading when instantiating a ChainstateManager 031a96dc6b7 kernel: Add chainstate manager option for setting worker threads c2f03a11251 kernel: Add chainstate manager object to C header 18ec1cc195b kernel: Add notifications context option to C header e3b03745f93 kernel: Add chain params context option to C header ef426234c07 kernel: Add kernel library context object 2c5e6b55922 kernel: Add logging to kernel library C header 20f1f67de07 kernel: Introduce initial kernel C header API 998386d4462 Merge bitcoin/bitcoin#31866: test, refactor: Add TestNode.binaries to hold binary paths aa87e0b4460 Merge bitcoin/bitcoin#31519: refactor: Use std::span over Span ef525e8b7c1 Merge bitcoin/bitcoin#31457: fuzz: Speed up *_package_eval fuzz targets a bit 7d76c9725ca Merge bitcoin/bitcoin#31766: leveldb: pull upstream C++23 changes 780bcf80b5d Merge bitcoin/bitcoin#32091: test: replace assert with assert_equal and assert_greater_than e568c1dd134 Merge bitcoin/bitcoin#32088: test: switch wallet_crosschain.py to signet and drop testnet4 e8f6a48e310 Merge bitcoin/bitcoin#32057: test: avoid disk space warning for non-regtest 387385ba1ed test: replace assert with assert_equal and assert_greater_than d190f0facc8 test, contrib: Fix signer/miner command line escaping 223fc24c4eb Merge bitcoin/bitcoin#31603: descriptor: check whitespace in keys within fragments 0d2eefca8bf test, refactor: Add TestNode.binaries to hold binary paths d61a847af0b Merge bitcoin/bitcoin#32019: cmake: Check for `makensis` and `zip` tools before using them for optional `deploy` targets cec14ee47d7 test: switch wallet_crosschain.py to signet 9c2951541c2 test: drop testnet4 from wallet_crosschain.py 14fec6380dd Merge bitcoin/bitcoin#32059: test: Update coverage.cpp to drop linux restriction ece0b41da6d Merge bitcoin/bitcoin#32087: ci: Drop ENABLE_HARDENING=OFF from clang-tidy c9b633d1190 Merge bitcoin/bitcoin#31948: ci: [lint] Use Cirrus dockerfile cache 6245c235046 Merge bitcoin/bitcoin#32083: doc: shallow clone `qa-assets` 257fd27e4bb Merge bitcoin/bitcoin#32033: test: Check datadir cleanup after assumeutxo was successful 6f9f415a4fa doc: shallow clone qa-assets db2c57ae9ee Merge bitcoin-core/gui#858: qt: doc: adapt outdated binary paths to CMake changes c8fab356171 ci: remove -Wno-error=deprecated-declarations from ASAN 24fd0235e45 Update leveldb subtree to latest upstream a130bbd154d Squashed 'src/leveldb/' changes from 04b5790928..4188247086 a799415d84d Merge bitcoin/bitcoin#31904: refactor: modernize outdated trait patterns using helper aliases (C++14/C++17) 5f4422d68dc Merge bitcoin/bitcoin#32010: qa: Fix TxIndex race conditions 52482cb2440 test: Check datadir cleanup after assumeutxo was successful 7ebc458a8cb qt: doc: adapt outdated binary paths to CMake changes cd8089c20ba Merge bitcoin/bitcoin#32069: test: fix intermittent failure in wallet_reorgsrestore.py 70a0ee89c67 Merge bitcoin/bitcoin#32063: test: fix intermittent failure in p2p_orphan_handling.py 54e6eacc1fc test: Enable ResetCoverageCounters beyond Linux 83a9e55ae16 Merge bitcoin/bitcoin#32070: build: use make < 3.82 syntax for define directive ca05b28710a Merge bitcoin/bitcoin#31859: test: Rename send_message to send_without_ping ab2df1726ed Merge bitcoin/bitcoin#31917: fuzz: provide more realistic values to the base58(check) decoders 51a20e56c2f Merge bitcoin/bitcoin#31977: test: Use rpc_deprecated only for testing deprecation fac3d93c2ba fuzz: Speed up *_package_eval fuzz targets a bit fa40fd043ab fuzz: [refactor] Avoid confusing c-style cast 20fe41e9e83 test: avoid disk space warning for non-regtest 2819c514825 test: Use rpc_deprecated only for testing deprecation 7d34c19853e ci: Drop ENABLE_HARDENING=OFF from clang-tidy 9157d9e4498 build: use make < 3.82 syntax for define directive 36b0713edc4 test: fix intermittent failure in wallet_reorgsrestore.py fa9cf38ab66 scripted-diff: test: Rename send_message to send_without_ping fa4356717d6 test: Prefer send_and_pi 67E6 ng over send_message+sync_with_ping 02942056fd8 test: fix intermittent failure in p2p_orphan_handling.py 1f9b2e150ce cmake: Require `zip` only for `deploy` target 0aeff299513 cmake: Check for `makensis` tool before using it fa3b4427158 ci: Use Cirrus dockerfile cache ffff4a293ad bench: Update span-serialize comment fa4d6ec97bc refactor: Avoid false-positive gcc warning fa942332b40 scripted-diff: Bump copyright headers after std::span changes fa0c6b7179c refactor: Remove unused Span alias fade0b5e5e6 scripted-diff: Use std::span over Span fadccc26c03 refactor: Make Span an alias of std::span fa27e36717e test: Fix broken span_tests fadf02ef8bf refactor: Return std::span from MakeUCharSpan fa720b94be1 refactor: Return std::span from MakeByteSpan 3301d2cbe8c qa: Wait for txindex to avoid race condition 9bfb0d75ba1 qa: Remove unnecessary -txindex args 7ac281c19cd qa: Add missing coverage of corrupt indexes d5537c18a90 fuzz: make sure DecodeBase58(Check) is called with valid values more often bad1433ef2b fuzz: Always restrict base conversion input lengths 21e9d39a372 docs: add release notes for 31603 a8b548d75d9 test: `getdescriptorinfo`/`importdescriptors` with whitespace in pubkeys c7afca3d62c test: descriptor: check whitespace into keys cb722a3cea1 descriptor: check whitespace in ParsePubkeyInner 4cd95a29218 refactor: modernize remaining outdated trait patterns ab2b67fce20 scripted-diff: modernize outdated trait patterns - values 8327889f358 scripted-diff: modernize outdated trait patterns - types 50856695ef6 test: fix descriptors in `ismine_tests` REVERT: 2dc27e2860b kernel: Add pure kernel bitcoin-chainstate REVERT: 338126c048f kernel: Add functions to get the block hash from a block REVERT: 56345a77968 kernel: Add block index utility functions to C header REVERT: 9530f65d19b kernel: Add function to read block undo data from disk to C header REVERT: f63860169fb kernel: Add functions to read block from disk to C header REVERT: f3aa1f9bf0c kernel: Add function for copying block data to C header REVERT: a70be77c908 kernel: Add functions for the block validation state to C header REVERT: e4e3dc585a3 kernel: Add validation interface to C header REVERT: d3c48b2bdc6 kernel: Add interrupt function to C header REVERT: 7afbc516054 kernel: Add import blocks function to C header REVERT: bad89c8b30b kernel: Add chainstate load options for in-memory dbs in C header REVERT: 1dcedf3da97 kernel: Add options for reindexing in C header REVERT: aeb68c7f022 kernel: Add block validation to C header REVERT: 99136eb1656 kernel: Add chainstate loading when instantiating a ChainstateManager REVERT: 0a2117ed501 kernel: Add chainstate manager option for setting worker threads REVERT: 599dc235e98 kernel: Add chainstate manager object to C header REVERT: f280a5f3ab8 kernel: Add notifications context option to C header REVERT: 6701d12b017 kernel: Add chain params context option to C header REVERT: f40f037a9cd kernel: Add kernel library context object REVERT: 7a6c5c7abf2 kernel: Add logging to kernel library C header REVERT: 4d663446de1 kernel: Introduce initial kernel C header API git-subtree-dir: depend/bitcoin git-subtree-split: 29f05b91cf8a479e403b0322afeb5ff1133da221
stickies-v
added a commit
to stickies-v/py-bitcoinkernel
that referenced
this pull request
Mar 21, 2025
29f05b91cf8 kernel: Add pure kernel bitcoin-chainstate b7733085a90 kernel: Add functions to get the block hash from a block a4f79616064 kernel: Add block index utility functions to C header 0a0062b85a7 kernel: Add function to read block undo data from disk to C header e49808a42d3 kernel: Add functions to read block from disk to C header 2f54bd53745 kernel: Add function for copying block data to C header c34ecbefbd8 kernel: Add functions for the block validation state to C header 0b46337ebe3 kernel: Add validation interface to C header 4c7a81a030e kernel: Add interrupt function to C header edf1d56fc05 kernel: Add import blocks function to C header 894b9c20447 kernel: Add chainstate load options for in-memory dbs in C header 157de0eccd3 kernel: Add options for reindexing in C header bdff17958b1 kernel: Add block validation to C header c52ca9447fc kernel: Add chainstate loading when instantiating a ChainstateManager 031a96dc6b7 kernel: Add chainstate manager option for setting worker threads c2f03a11251 kernel: Add chainstate manager object to C header 18ec1cc195b kernel: Add notifications context option to C header e3b03745f93 kernel: Add chain params context option to C header ef426234c07 kernel: Add kernel library context object 2c5e6b55922 kernel: Add logging to kernel library C header 20f1f67de07 kernel: Introduce initial kernel C header API 998386d4462 Merge bitcoin/bitcoin#31866: test, refactor: Add TestNode.binaries to hold binary paths aa87e0b4460 Merge bitcoin/bitcoin#31519: refactor: Use std::span over Span ef525e8b7c1 Merge bitcoin/bitcoin#31457: fuzz: Speed up *_package_eval fuzz targets a bit 7d76c9725ca Merge bitcoin/bitcoin#31766: leveldb: pull upstream C++23 changes 780bcf80b5d Merge bitcoin/bitcoin#32091: test: replace assert with assert_equal and assert_greater_than e568c1dd134 Merge bitcoin/bitcoin#32088: test: switch wallet_crosschain.py to signet and drop testnet4 e8f6a48e310 Merge bitcoin/bitcoin#32057: test: avoid disk space warning for non-regtest 387385ba1ed test: replace assert with assert_equal and assert_greater_than d190f0facc8 test, contrib: Fix signer/miner command line escaping 223fc24c4eb Merge bitcoin/bitcoin#31603: descriptor: check whitespace in keys within fragments 0d2eefca8bf test, refactor: Add TestNode.binaries to hold binary paths d61a847af0b Merge bitcoin/bitcoin#32019: cmake: Check for `makensis` and `zip` tools before using them for optional `deploy` targets cec14ee47d7 test: switch wallet_crosschain.py to signet 9c2951541c2 test: drop testnet4 from wallet_crosschain.py 14fec6380dd Merge bitcoin/bitcoin#32059: test: Update coverage.cpp to drop linux restriction ece0b41da6d Merge bitcoin/bitcoin#32087: ci: Drop ENABLE_HARDENING=OFF from clang-tidy c9b633d1190 Merge bitcoin/bitcoin#31948: ci: [lint] Use Cirrus dockerfile cache 6245c235046 Merge bitcoin/bitcoin#32083: doc: shallow clone `qa-assets` 257fd27e4bb Merge bitcoin/bitcoin#32033: test: Check datadir cleanup after assumeutxo was successful 6f9f415a4fa doc: shallow clone qa-assets db2c57ae9ee Merge bitcoin-core/gui#858: qt: doc: adapt outdated binary paths to CMake changes c8fab356171 ci: remove -Wno-error=deprecated-declarations from ASAN 24fd0235e45 Update leveldb subtree to latest upstream a130bbd154d Squashed 'src/leveldb/' changes from 04b5790928..4188247086 a799415d84d Merge bitcoin/bitcoin#31904: refactor: modernize outdated trait patterns using helper aliases (C++14/C++17) 5f4422d68dc Merge bitcoin/bitcoin#32010: qa: Fix TxIndex race conditions 52482cb2440 test: Check datadir cleanup after assumeutxo was successful 7ebc458a8cb qt: doc: adapt outdated binary paths to CMake changes cd8089c20ba Merge bitcoin/bitcoin#32069: test: fix intermittent failure in wallet_reorgsrestore.py 70a0ee89c67 Merge bitcoin/bitcoin#32063: test: fix intermittent failure in p2p_orphan_handling.py 54e6eacc1fc test: Enable ResetCoverageCounters beyond Linux 83a9e55ae16 Merge bitcoin/bitcoin#32070: build: use make < 3.82 syntax for define directive ca05b28710a Merge bitcoin/bitcoin#31859: test: Rename send_message to send_without_ping ab2df1726ed Merge bitcoin/bitcoin#31917: fuzz: provide more realistic values to the base58(check) decoders 51a20e56c2f Merge bitcoin/bitcoin#31977: test: Use rpc_deprecated only for testing deprecation fac3d93c2ba fuzz: Speed up *_package_eval fuzz targets a bit fa40fd043ab fuzz: [refactor] Avoid confusing c-style cast 20fe41e9e83 test: avoid disk space warning for non-regtest 2819c514825 test: Use rpc_deprecated only for testing deprecation 7d34c19853e ci: Drop ENABLE_HARDENING=OFF from clang-tidy 9157d9e4498 build: use make < 3.82 syntax for define directive 36b0713edc4 test: fix intermittent failure in wallet_reorgsrestore.py fa9cf38ab66 scripted-diff: test: Rename send_message to send_without_ping fa4356717d6 test: Prefer send_and_ping over send_message+sync_with_ping 02942056fd8 test: fix intermittent failure in p2p_orphan_handling.py 1f9b2e150ce cmake: Require `zip` only for `deploy` target 0aeff299513 cmake: Check for `makensis` tool before using it fa3b4427158 ci: Use Cirrus dockerfile cache ffff4a293ad bench: Update span-serialize comment fa4d6ec97bc refactor: Avoid false-positive gcc warning fa942332b40 scripted-diff: Bump copyright headers after std::span changes fa0c6b7179c refactor: Remove unused Span alias fade0b5e5e6 scripted-diff: Use std::span over Span fadccc26c03 refactor: Make Span an alias of std::span fa27e36717e test: Fix broken span_tests fadf02ef8bf refactor: Return std::span from MakeUCharSpan fa720b94be1 refactor: Return std::span from MakeByteSpan 3301d2cbe8c qa: Wait for txindex to avoid race condition 9bfb0d75ba1 qa: Remove unnecessary -txindex args 7ac281c19cd qa: Add missing coverage of corrupt indexes d5537c18a90 fuzz: make sure DecodeBase58(Check) is called with valid values more often bad1433ef2b fuzz: Always restrict base conversion input lengths 21e9d39a372 docs: add release notes for 31603 a8b548d75d9 test: `getdescriptorinfo`/`importdescriptors` with whitespace in pubkeys c7afca3d62c test: descriptor: check whitespace into keys cb722a3cea1 descriptor: check whitespace in ParsePubkeyInner 4cd95a29218 refactor: modernize remaining outdated trait patterns ab2b67fce20 scripted-diff: modernize outdated trait patterns - values 8327889f358 scripted-diff: modernize outdated trait patterns - types 50856695ef6 test: fix descriptors in `ismine_tests` REVERT: 2dc27e2860b kernel: Add pure kernel bitcoin-chainstate REVERT: 338126c048f kernel: Add functions to get the block hash from a block REVERT: 56345a77968 kernel: Add block index utility functions to C header REVERT: 9530f65d19b kernel: Add function to read block undo data from disk to C header REVERT: f63860169fb kernel: Add functions to read block from disk to C header REVERT: f3aa1f9bf0c kernel: Add function for copying block data to C header REVERT: a70be77c908 kernel: Add functions for the block validation state to C header REVERT: e4e3dc585a3 kernel: Add validation interface to C header REVERT: d3c48b2bdc6 kernel: Add interrupt function to C header REVERT: 7afbc516054 kernel: Add import blocks function to C header REVERT: bad89c8b30b kernel: Add chainstate load options for in-memory dbs in C header REVERT: 1dcedf3da97 kernel: Add options for reindexing in C header REVERT: aeb68c7f022 kernel: Add block validation to C header REVERT: 99136eb1656 kernel: Add chainstate loading when instantiating a ChainstateManager REVERT: 0a2117ed501 kernel: Add chainstate manager option for setting worker threads REVERT: 599dc235e98 kernel: Add chainstate manager object to C header REVERT: f280a5f3ab8 kernel: Add notifications context option to C header REVERT: 6701d12b017 kernel: Add chain params context option to C header REVERT: f40f037a9cd kernel: Add kernel library context object REVERT: 7a6c5c7abf2 kernel: Add logging to kernel library C header REVERT: 4d663446de1 kernel: Introduce initial kernel C header API git-subtree-dir: depend/bitcoin git-subtree-split: 29f05b91cf8a479e403b0322afeb5ff1133da221
TheCharlatan
added a commit
to TheCharlatan/rust-bitcoinkernel
that referenced
this pull request
Mar 24, 2025
…f05b91cf8 29f05b91cf8 kernel: Add pure kernel bitcoin-chainstate b7733085a90 kernel: Add functions to get the block hash from a block a4f79616064 kernel: Add block index utility functions to C header 0a0062b85a7 kernel: Add function to read block undo data from disk to C header e49808a42d3 kernel: Add functions to read block from disk to C header 2f54bd53745 kernel: Add function for copying block data to C header c34ecbefbd8 kernel: Add functions for the block validation state to C header 0b46337ebe3 kernel: Add validation interface to C header 4c7a81a030e kernel: Add interrupt function to C header edf1d56fc05 kernel: Add import blocks function to C header 894b9c20447 kernel: Add chainstate load options for in-memory dbs in C header 157de0eccd3 kernel: Add options for reindexing in C header bdff17958b1 kernel: Add block validation to C header c52ca9447fc kernel: Add chainstate loading when instantiating a ChainstateManager 031a96dc6b7 kernel: Add chainstate manager option for setting worker threads c2f03a11251 kernel: Add chainstate manager object to C header 18ec1cc195b kernel: Add notifications context option to C header e3b03745f93 kernel: Add chain params context option to C header ef426234c07 kernel: Add kernel library context object 2c5e6b55922 kernel: Add logging to kernel library C header 20f1f67de07 kernel: Introduce initial kernel C header API 998386d4462 Merge bitcoin/bitcoin#31866: test, refactor: Add TestNode.binaries to hold binary paths aa87e0b4460 Merge bitcoin/bitcoin#31519: refactor: Use std::span over Span ef525e8b7c1 Merge bitcoin/bitcoin#31457: fuzz: Speed up *_package_eval fuzz targets a bit 7d76c9725ca Merge bitcoin/bitcoin#31766: leveldb: pull upstream C++23 changes 780bcf80b5d Merge bitcoin/bitcoin#32091: test: replace assert with assert_equal and assert_greater_than e568c1dd134 Merge bitcoin/bitcoin#32088: test: switch wallet_crosschain.py to signet and drop testnet4 e8f6a48e310 Merge bitcoin/bitcoin#32057: test: avoid disk space warning for non-regtest 387385ba1ed test: replace assert with assert_equal and assert_greater_than d190f0facc8 test, contrib: Fix signer/miner command line escaping 223fc24c4eb Merge bitcoin/bitcoin#31603: descriptor: check whitespace in keys within fragments 0d2eefca8bf test, refactor: Add TestNode.binaries to hold binary paths d61a847af0b Merge bitcoin/bitcoin#32019: cmake: Check for `makensis` and `zip` tools before using them for optional `deploy` targets cec14ee47d7 test: switch wallet_crosschain.py to signet 9c2951541c2 test: drop testnet4 from wallet_crosschain.py 14fec6380dd Merge bitcoin/bitcoin#32059: test: Update coverage.cpp to drop linux restriction ece0b41da6d Merge bitcoin/bitcoin#32087: ci: Drop ENABLE_HARDENING=OFF from clang-tidy c9b633d1190 Merge bitcoin/bitcoin#31948: ci: [lint] Use Cirrus dockerfile cache 6245c235046 Merge bitcoin/bitcoin#32083: doc: shallow clone `qa-assets` 257fd27e4bb Merge bitcoin/bitcoin#32033: test: Check datadir cleanup after assumeutxo was successful 6f9f415a4fa doc: shallow clone qa-assets db2c57ae9ee Merge bitcoin-core/gui#858: qt: doc: adapt outdated binary paths to CMake changes c8fab356171 ci: remove -Wno-error=deprecated-declarations from ASAN 24fd0235e45 Update leveldb subtree to latest upstream a130bbd154d Squashed 'src/leveldb/' changes from 04b5790928..4188247086 a799415d84d Merge bitcoin/bitcoin#31904: refactor: modernize outdated trait patterns using helper aliases (C++14/C++17) 5f4422d68dc Merge bitcoin/bitcoin#32010: qa: Fix TxIndex race conditions 52482cb2440 test: Check datadir cleanup after assumeutxo was successful 7ebc458a8cb qt: doc: adapt outdated binary paths to CMake changes cd8089c20ba Merge bitcoin/bitcoin#32069: test: fix intermittent failure in wallet_reorgsrestore.py 70a0ee89c67 Merge bitcoin/bitcoin#32063: test: fix intermittent failure in p2p_orphan_handling.py 54e6eacc1fc test: Enable ResetCoverageCounters beyond Linux 83a9e55ae16 Merge bitcoin/bitcoin#32070: build: use make < 3.82 syntax for define directive ca05b28710a Merge bitcoin/bitcoin#31859: test: Rename send_message to send_without_ping ab2df1726ed Merge bitcoin/bitcoin#31917: fuzz: provide more realistic values to the base58(check) decoders 51a20e56c2f Merge bitcoin/bitcoin#31977: test: Use rpc_deprecated only for testing deprecation fac3d93c2ba fuzz: Speed up *_package_eval fuzz targets a bit fa40fd043ab fuzz: [refactor] Avoid confusing c-style cast 20fe41e9e83 test: avoid disk space warning for non-regtest 2819c514825 test: Use rpc_deprecated only for testing deprecation 7d34c19853e ci: Drop ENABLE_HARDENING=OFF from clang-tidy 9157d9e4498 build: use make < 3.82 syntax for define directive 36b0713edc4 test: fix intermittent failure in wallet_reorgsrestore.py fa9cf38ab66 scripted-diff: test: Rename send_message to send_without_ping fa4356717d6 test: Prefer send_and_ping over send_message+sync_with_ping 02942056fd8 test: fix intermittent failure in p2p_orphan_handling.py 1f9b2e150ce cmake: Require `zip` only for `deploy` target 0aeff299513 cmake: Check for `makensis` tool before using it fa3b4427158 ci: Use Cirrus dockerfile cache ffff4a293ad bench: Update span-serialize comment fa4d6ec97bc refactor: Avoid false-positive gcc warning fa942332b40 scripted-diff: Bump copyright headers after std::span changes fa0c6b7179c refactor: Remove unused Span alias fade0b5e5e6 scripted-diff: Use std::span over Span fadccc26c03 refactor: Make Span an alias of std::span fa27e36717e test: Fix broken span_tests fadf02ef8bf refactor: Return std::span from MakeUCharSpan fa720b94be1 refactor: Return std::span from MakeByteSpan 3301d2cbe8c qa: Wait for txindex to avoid race condition 9bfb0d75ba1 qa: Remove unnecessary -txindex args 7ac281c19cd qa: Add missing coverage of corrupt indexes d5537c18a90 fuzz: make sure DecodeBase58(Check) is called with valid values more often bad1433ef2b fuzz: Always restrict base conversion input lengths 21e9d39a372 docs: add release notes for 31603 a8b548d75d9 test: `getdescriptorinfo`/`importdescriptors` with whitespace in pubkeys c7afca3d62c test: descriptor: check whitespace into keys cb722a3cea1 descriptor: check whitespace in ParsePubkeyInner 4cd95a29218 refactor: modernize remaining outdated trait patterns ab2b67fce20 scripted-diff: modernize outdated trait patterns - values 8327889f358 scripted-diff: modernize outdated trait patterns - types 50856695ef6 test: fix descriptors in `ismine_tests` REVERT: 5991a69ee00 kernel: Add pure kernel bitcoin-chainstate REVERT: 05b7d136684 kernel: Add functions to get the block hash from a block REVERT: f18c792d843 kernel: Add block index utility functions to C header REVERT: 89f5bf04673 kernel: Add function to read block undo data from disk to C header REVERT: b4f71fc64e7 kernel: Add functions to read block from disk to C header REVERT: 41306f081ad kernel: Add function for copying block data to C header REVERT: 9385d9fc87e kernel: Add functions for the block validation state to C header REVERT: 0bd9a710358 kernel: Add validation interface to C header REVERT: 432710f3fc3 kernel: Add interrupt function to C header REVERT: cb164ae1eb2 kernel: Add import blocks function to C header REVERT: abd67fd93d0 kernel: Add chainstate load options for in-memory dbs in C header REVERT: b98c2748e94 kernel: Add options for reindexing in C header REVERT: 9d0efe1fc86 kernel: Add block validation to C header REVERT: 87e364fc1ec kernel: Add chainstate loading when instantiating a ChainstateManager REVERT: df1599b2d2a kernel: Add chainstate manager option for setting worker threads REVERT: fb767002e97 kernel: Add chainstate manager object to C header REVERT: 10b0fad2fd3 kernel: Add notifications context option to C header REVERT: 39e7ad8d0dc kernel: Add chain params context option to C header REVERT: 6285c353b89 kernel: Add kernel library context object REVERT: 98d10160b6a kernel: Add logging to kernel library C header REVERT: 4d663446de1 kernel: Introduce initial kernel C header API git-subtree-dir: libbitcoinkernel-sys/bitcoin git-subtree-split: 29f05b91cf8a479e403b0322afeb5ff1133da221
fanquake
pushed a commit
to fanquake/bitcoin
that referenced
this pull request
Apr 17, 2025
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 bitcoin#32068 Co-authored-by: Ryan Ofsky <ryan@ofsky.org> Github-Pull: bitcoin#32070 Rebased-From: 9157d9e
Merged
fanquake
added a commit
that referenced
this pull request
May 6, 2025
…for macOS 22cff32 doc: recommend gmake for FreeBSD (Sjors Provoost) b645c52 doc: recommend modern make for macOS depends (Sjors Provoost) 99e6490 doc: shuffle depends instructions (Sjors Provoost) Pull request description: macOS ships with GNU Make 3.81 from 2006. This has caused difficult to debug issues, e.g. #32070 and #30978. Tell users / developers who use the depends system to install a modern version of `make`. This PR does not change the non-depends build. Although Homebrew allows overriding the system `make`, we instead just instruct users to build with `gmake`. This way there should be no impact on other projects they wish to compile. To increase the likeliness of anyone actually seeing and following this instruction, the first commit moves things around in `depends/README.md`. It now starts with instructions for a local build and moves cross-compilation to the end. For each platform it shows what to install (`apt install`, `brew install`, etc) and what command to run (`make` or `gmake`). There previously was no macOS specific section, so this is added. It points to the general `build-osx.md` for how to install the Xcode Command Line Tools and Homebrew Package Manager. I didn't test on an empty system. Preview: https://github.com/Sjors/bitcoin/tree/2025/03/mc-make/depends#depends-build ACKs for top commit: maflcko: review ACK 22cff32 🏣 hebasto: re-ACK 22cff32. willcl-ark: ACK 22cff32 Tree-SHA512: 11648ae73f3b70bc2df771e4eddca37221cd88b88bea4139a183e3f67f24a4c3e5aadf61a713ed73f3fc206511dfcf8670e4c4143c49dd4e56e501030be9c7ba
fanquake
added a commit
that referenced
this pull request
May 13, 2025
812e637 doc: update release notes for 28.x (fanquake) 2ccdfa4 scripted-diff: Use bpf_cflags (MarcoFalke) 3df2624 test: Add imports for util bpf_cflags (MarcoFalke) e656762 build: use make < 3.82 syntax for define directive (Sjors Provoost) 2d6c14e refactor: Remove spurious virtual from final ~CZMQNotificationInterface (MarcoFalke) 9b15b20 test: Handle empty string returned by CLI as None in RPC tests (Brandon Odiwuor) Pull request description: Backports: - #32070 - #32187 - #32286 - #32336 ACKs for top commit: willcl-ark: ACK 812e637 Tree-SHA512: b5c9c6b70588658310fd2d79dbd2d1148d8650e020daa9ac8ea2d3380c1e95a92e554b43b0dfd989308a729c5226e1f1ddb13cb1bb56dc5be571e4fc2f2795d6
fanquake
pushed a commit
to fanquake/bitcoin
that referenced
this pull request
May 13, 2025
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 bitcoin#32068 Co-authored-by: Ryan Ofsky <ryan@ofsky.org> Github-Pull: bitcoin#32070 Rebased-From: 9157d9e
Merged
fanquake
added a commit
that referenced
this pull request
Jun 9, 2025
1d8856d doc: update release notes for 27.x (fanquake) aef6586 depends: use "mkdir -p" when installing xproto (fanquake) a328170 guix: accomodate migration to codeberg (fanquake) e0af7bf ci: remove --enable-external-signer (fanquake) 8821666 scripted-diff: Use bpf_cflags (MarcoFalke) 1fc7b9d test: Add imports for util bpf_cflags (MarcoFalke) f52ab00 build: use make < 3.82 syntax for define directive (Sjors Provoost) 418bee8 refactor: Remove spurious virtual from final ~CZMQNotificationInterface (MarcoFalke) 992c7ca test: Handle empty string returned by CLI as None in RPC tests (Brandon Odiwuor) Pull request description: Backports - #32070 - #32187 - #32286 - #32439 - #32568 ACKs for top commit: willcl-ark: ACK 1d8856d Tree-SHA512: ca8534c24a806a35528f0d40a201fe0c66aa101a8cbeff9ef18d7599c300e6ca47d33563cd84198f1c15d77da7a141e8fcc0a2bd0a40165da6142dbbf1dcdc6c
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.
From the GNU make 3.82 release announcement (2010):
macOS ships with 3.81 (2006). This caused the multiprocess config options to be ignored.
Fixes #32068