build: Propagate user-defined flags to host packages #23619
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. 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. ConflictsNo conflicts as of last run. |
Guix builds: |
dscotese
added a commit
to dscotese/bitcoin
that referenced
this pull request
Apr 6, 2022
This is a single commit to replace the three commits from bitcoin/bitcoin PR bitcoin#23619.
Guix builds on
|
portlandhodl
pushed a commit
to portlandhodl/bitcoin
that referenced
this pull request
Apr 21, 2022
This is a single commit to replace the three commits from bitcoin/bitcoin PR bitcoin#23619.
portlandhodl
added a commit
to portlandhodl/bitcoin
that referenced
this pull request
Apr 21, 2022
commit df59c59 Merge: 86388ec 7f6d381 Author: russeree <reese.russell@ymail.com> Date: Thu Apr 21 02:40:27 2022 -0700 Merge branch 'bpf-tracepoints' of https://github.com/russeree/bitcoin into bpf-tracepoints commit 86388ec Author: Pavol Rusnak <pavol@rusnak.io> Date: Wed Apr 13 14:35:57 2022 +0200 Final PR - Squash 2 doc: add more info to dependencies.md Script Documentation Spelling Fixes Completed mempool:event tracepoint Update README.md Update tracing.md commit 57adc9f Author: fanquake <fanquake@gmail.com> Date: Fri Dec 31 16:08:55 2021 +0800 build: don't compress macOS DMG commit 17fbbae Author: Pavol Rusnak <pavol@rusnak.io> Date: Sat Mar 12 12:13:53 2022 +0100 contrib: macdeploy: monkey-patch gen-sdk to be deterministic on different Python versions (there was a change in TAR handling between Python 3.8 and Python 3.9) commit fd5826c Author: Pavol Rusnak <pavol@rusnak.io> Date: Fri Mar 11 16:20:29 2022 +0100 contrib: macdeploy: make gen-sdk deterministic commit 40484bb Author: Dave Scotese <dscotese@litmocracy.com> Date: Wed Apr 6 08:47:14 2022 -0700 doc: Add gpg key import instructions for Windows This is a single commit to replace the three commits from bitcoin/bitcoin PR bitcoin#23619. commit 7a2aada Author: Carl Dong <contact@carldong.me> Date: Fri Mar 18 12:35:52 2022 -0400 scripted-diff: Rename pindexBestHeader, fHavePruned ...to m_best_header and m_have_pruned -BEGIN VERIFY SCRIPT- find_regex="\bpindexBestHeader\b" \ && git grep -l -E "$find_regex" -- src \ | xargs sed -i -E "s@$find_regex@m_best_header@g" find_regex="\bfHavePruned\b" \ && git grep -l -E "$find_regex" -- src \ | xargs sed -i -E "s@$find_regex@m_have_pruned@g" -END VERIFY SCRIPT- commit bc11a70 Author: Carl Dong <contact@carldong.me> Date: Wed Feb 23 15:22:24 2022 -0500 Clear fHavePruned in BlockManager::Unload() ----- Code Reviewer Notes Call graph of relevant functions: UnloadBlockIndex() <-- Moved from calls ChainstateManager::Unload() which calls BlockManager::Unload() <-- Moved to So calling UnloadBlockIndex() would still run this moved code. The code will also now run when ~BlockManager gets called, which makes sense. commit faca901 Author: Carl Dong <contact@carldong.me> Date: Thu Dec 24 20:06:34 2020 -0500 move-mostly: Make fHavePruned a BlockMan member [META] In the next commit, we move the clearing of fHavePruned to BlockManager::Unload() commit f249b58 Author: Carl Dong <contact@carldong.me> Date: Wed Feb 23 15:21:09 2022 -0500 Clear pindexBestHeader in ChainstateManager::Unload() ----- Code Reviewer Notes Call graph of relevant functions: UnloadBlockIndex() <-- Moved from calls ChainstateManager::Unload() <-- Moved to Safe because ChainstateManager::Unload() is called only by UnloadBlockIndex() and no other callers. commit 69b847c Author: Carl Dong <contact@carldong.me> Date: Fri Mar 18 12:31:30 2022 -0400 style-only: Miscellaneous whitespace changes ...of touched lines and surrounding commit f924a93 Author: Carl Dong <contact@carldong.me> Date: Thu Dec 24 16:18:46 2020 -0500 move-mostly: Make pindexBestHeader a ChainMan member [META] In the next commit, we move the clearing of pindexBestHeader to ChainstateManager::Unload() commit bec7655 Author: Carl Dong <contact@carldong.me> Date: Fri Mar 18 12:22:34 2022 -0400 validation: Load pindexBestHeader in ChainMan Now BlockManager::LoadBlockIndex() will ACTUALLY only load BlockMan members. [META] In a later commit, pindexBestHeader will be moved to ChainMan as a member ----- Code Reviewer Notes Call graph of relevant functions: ChainstateManager::LoadBlockIndex() <-- Moved to calls BlockManager::LoadBlockIndexDB() which calls BlockManager::LoadBlockIndex() <-- Moved from There is only one call to each of inner functions, meaning that no behavior is changing. commit 435dd5e Author: Dimitri <kvaciral@protonmail.com> Date: Sat Apr 16 18:19:01 2022 +0200 lint: Convert lint-includes.sh to Python commit 71999ba Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Wed Apr 13 18:15:29 2022 +0200 qt: Do not assume `qDBusRegisterMetaType` return type `qDBusRegisterMetaType` returns: - `int` in Qt 5 - `QMetaType` in Qt 6 commit d60bcfe Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sat Apr 9 02:21:05 2022 +0200 qt: Do not use `QKeyEvent` copy constructor This change is preparation for Qt 6, and it fixes an experimental build with Qt 6.2.4 as copying of `QEvent` has been disabled in Qt 6.0.0 (see 19f9b0d5f54379151eb71e98555b203ad6756276 upstream commit). commit f6befe2 Author: Antoine Poinsot <darosior@protonmail.com> Date: Fri Apr 15 14:03:37 2022 +0200 miniscript: the 'd:' wrapper must not be 'u' The value it leaves on the stack depends on the last element on the stack. However, we can't make sure this element is OP_1 (which would give us the 'u' property) without the MINIMALIF rule. MINIMALIF is only policy for P2WSH, therefore giving 'd:' the 'u' property breaks consensus soundness: it makes it possible (by consensus but not policy) for instance to satisfy a thresh() without satisfying at least k of its subs. This bug was found and reported by Andrew Poelstra. commit 922c1a4 Author: Vasil Dimov <vd@FreeBSD.org> Date: Tue Apr 13 14:01:44 2021 +0200 net: use Sock::SetSockOpt() instead of standalone SetSocketNoDelay() Since the former is mockable, this makes it easier to test higher level code that sets the TCP_NODELAY flag. commit 31e6b01 Author: Vasil Dimov <vd@FreeBSD.org> Date: Tue Apr 13 13:28:10 2021 +0200 net: use Sock::SetSockOpt() instead of setsockopt() commit 89d3e90 Author: Vasil Dimov <vd@FreeBSD.org> Date: Tue Apr 13 12:31:49 2021 +0200 net: add new method Sock::SetSockOpt() that wraps setsockopt() This will help to increase `Sock` usage and make more code mockable. commit 2ab6908 Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue Apr 5 13:52:13 2022 +0200 refactor: Use [[maybe_unused]] attribute commit 80b3b1c Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue Apr 5 13:23:12 2022 +0200 refactor: Drop unneeded workarounds aimed to silence unused warning All of the touched symbols are indeed used regardless of any macros. commit 3a632af Author: MarcoFalke <falke.marco@gmail.com> Date: Sat Apr 9 14:41:09 2022 +0200 Simplify GetTime commit be6ee2b Author: Sebastian Falbesoner <sebastian.falbesoner@gmail.com> Date: Wed Apr 13 01:29:16 2022 +0200 test: use MiniWallet for p2p_segwit.py This change only affects the subtest `test_superfluous_witness`. Note that instead of creating a raw transaction first and then signing it, we go the other direction here: MiniWallet creates a transaction spending a segwit v1 output (i.e. including a witness), then we turn it into a raw transaction by dropping the witness. Therefore, the debug log asserts are swapped. commit d58e60c Author: MarcoFalke <falke.marco@gmail.com> Date: Tue Feb 23 16:40:42 2021 +0100 scripted-diff: Regenerate key_io data deterministically -BEGIN VERIFY SCRIPT- ./contrib/testgen/gen_key_io_test_vectors.py valid 70 > ./src/test/data/key_io_valid.json ./contrib/testgen/gen_key_io_test_vectors.py invalid 70 > ./src/test/data/key_io_invalid.json -END VERIFY SCRIPT- commit f106e76 Author: MarcoFalke <falke.marco@gmail.com> Date: Tue Feb 23 16:41:43 2021 +0100 contrib: make gen_key_io_test_vectors deterministic Also, remove instructions which are redundant with the README commit 511ca29 Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue Apr 19 12:14:58 2022 +0200 doc: Fix a link to `test/lint/lint-python.py` commit 79b1d4e Author: brunoerg <brunoely.gc@gmail.com> Date: Mon Apr 18 21:12:37 2022 -0300 doc: cleanups to mempool rest endpoints commit 443482b Author: brunoerg <brunoely.gc@gmail.com> Date: Tue Apr 5 14:39:00 2022 -0300 docs: update `/rest/chaininfo` doc referring to RPC help commit 1304c07 Author: Andrew Chow <achow101-github@achow101.com> Date: Mon Apr 18 15:52:26 2022 -0400 bench: Add a benchmark for wallet loading commit 5a41236 Author: Fabian Jahr <fjahr@protonmail.com> Date: Thu Apr 7 01:50:24 2022 +0200 lint: Convert Python linter to Python commit f22972a Author: Dimitri <kvaciral@protonmail.com> Date: Thu Apr 14 14:02:20 2022 +0200 lint: Convert lint-git-commit-check.sh to Python commit ec3b07b Author: Dimitri <kvaciral@protonmail.com> Date: Wed Apr 13 17:55:11 2022 +0200 lint: Convert lint-whitespace.sh to Python commit bc6dbdd Author: w0xlt <94266259+w0xlt@users.noreply.github.com> Date: Fri Apr 15 19:23:26 2022 -0300 test: Add a test that creates a wallet with invalid parameters Invalid parameters must not prevent a new wallet with the same name from being created with the correct parameters commit 4644a73 Author: w0xlt <94266259+w0xlt@users.noreply.github.com> Date: Fri Apr 15 03:32:19 2022 -0300 Change wallet validation order In the current code, the database is created before the last validation, which checks that passphrase is set and private keys are disabled. Therefore, if this validation fails, it will result in an empty database and the user will not be able to recreate a wallet with the same name and with the correct parameters. commit 637214d Author: laanwj <126646+laanwj@users.noreply.github.com> Date: Fri Apr 15 14:08:38 2022 +0200 contrib: Remove suspicious hosts list from makeseeds I have some qualms with maintaining a suspicious hosts list as part as the repository. But also, it's stale and irrelevant. I've checked the entire list and none of them is connectable. Only one still appars in `nodes_main.txt` but with low uptime and an old subversion string so it wouldn't be picked in the first place. commit ea1e5dc Author: Ryan Ofsky <ryan@ofsky.org> Date: Tue Apr 12 03:00:28 2022 -0400 init: Prevent -noproxy and -proxy=0 settings from interacting with other settings Prevent -noproxy and -proxy=0 settings from interacting with -listen, -upnp, and -natpmp settings. These settings started being handled inconsistently in the `AppInitMain` and `InitParameterInteraction` functions starting in commit baf0507 from bitcoin#6272: https://github.com/bitcoin/bitcoin/blob/baf05075fae2cc2625a2a74b35cc66902f3cbfa3/src/init.cpp#L990-L991 https://github.com/bitcoin/bitcoin/blob/baf05075fae2cc2625a2a74b35cc66902f3cbfa3/src/init.cpp#L687 This commit changes both functions to handle proxy arguments the same way so there are not side effects from specifying a proxy=0 setting. commit fbf5e20 Author: Andrew Chow <achow101-github@achow101.com> Date: Thu Apr 14 14:40:06 2022 -0400 test: Test for disabling wallet flags commit 4ef4cfa Author: Andrew Chow <achow101-github@achow101.com> Date: Thu Apr 14 14:39:21 2022 -0400 rpc, wallet: setwalletflags warnings are optional Without this, trying to disable a wallet flag results in an Internal bug detected. commit 53147a3 Author: chinggg <24590067+chinggg@users.noreply.github.com> Date: Sat Apr 16 11:16:32 2022 +0800 test: fix connman UB by calling derived constructor commit 44cf584 Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Fri Apr 8 23:56:40 2022 +0200 Final PR Submission Squash qt: Remove `QApplication::globalStrut()` call This function has been deprecated in Qt 5.15.0, and has been removed in Qt 6 (see 033d01bd6e2aef740ad1408a04d3ca0ae3b9ba9b upstream commit). Inital commit - Added Basic .CSV out Mempool Tracepoints Evict - 64bit single printf call unified .bt script - added event type arg Core code complete commit bf8f58c Author: William Casarin <jb55@jb55.com> Date: Tue Feb 22 09:15:52 2022 -0800 qt/wallettests: sort includes I split this out from an earlier commit to make it a bit less noisy. Signed-off-by: William Casarin <jb55@jb55.com> commit a57297b Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue Apr 20 22:15:39 2021 +0300 qt: Skip displayUnitChanged signal if unit is not actually changed Co-authored-by: João Barbosa <joao.paulo.barbosa@gmail.com> commit 44b5f39 Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu Jan 21 22:30:58 2021 +0200 qt, refactor: Remove default cases for scoped enum commit b36a5c8 Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu Jan 21 22:30:13 2021 +0200 qt, refactor: Remove BitcoinUnits::valid function Since BitcoinUnits::Unit became a scoped enum, BitcoinUnits::valid function is no longer needed. commit 8932277 Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu Jan 21 22:28:16 2021 +0200 qt, refactor: Make BitcoinUnits::Unit a scoped enum commit 2094896 Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu Jan 21 22:27:28 2021 +0200 qt: Use QVariant instead of int for BitcoinUnit in QSettings This change improves type safety. commit 7f6d381 Merge: 8d0ebc5 9c23f7a Author: russeree <reese.russell@ymail.com> Date: Thu Apr 21 02:18:41 2022 -0700 Merge branch 'bpf-tracepoints' of https://github.com/russeree/bitcoin into bpf-tracepoints commit 8d0ebc5 Author: russeree <reese.russell@ymail.com> Date: Thu Apr 21 02:17:35 2022 -0700 Completed mempool:event tracepoint commit 9c23f7a Author: Reese Russell <reese@rfpga.com> Date: Thu Apr 21 02:14:31 2022 -0700 Update tracing.md commit 9e827ef Author: Reese Russell <reese@rfpga.com> Date: Thu Apr 21 01:57:18 2022 -0700 Update README.md commit 4d5ba4b Author: russeree <reese.russell@ymail.com> Date: Thu Apr 21 01:52:17 2022 -0700 Spelling Fixes commit fb62d0d Author: russeree <reese.russell@ymail.com> Date: Thu Apr 21 01:49:49 2022 -0700 Script Documentation commit 621e0bf Merge: d7ee886 1c6fcea Author: Reese Russell <reese@rfpga.com> Date: Thu Apr 21 01:41:22 2022 -0700 Merge branch 'bitcoin:master' into bpf-tracepoints commit d7ee886 Author: russeree <reese.russell@ymail.com> Date: Thu Apr 21 01:36:28 2022 -0700 Core code complete commit 00c4df4 Author: russeree <reese.russell@ymail.com> Date: Wed Apr 20 03:43:08 2022 -0700 unified .bt script - added event type arg commit d181be2 Author: russeree <reese.russell@ymail.com> Date: Wed Apr 20 03:28:07 2022 -0700 Evict - 64bit single printf call commit c47ab7e Author: russeree <reese.russell@ymail.com> Date: Tue Apr 19 02:13:27 2022 -0700 Inital commit - Added Basic .CSV out Mempool Tracepoints
|
GUIX hashes x86: arm64: |
|
Code review ACK a3a2bd9 One nit, these flags could be documented in the depends README. |
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Jan 30, 2023
…ages a3a2bd9 ci: Drop no longer needed package-specific flags (Hennadii Stepanov) 071eef1 build: Propagate user-defined flags to host packages (Hennadii Stepanov) Pull request description: On master (4f8b1f8) `{CPP,C,CXX,LD}FLAGS` that are specified in the command line are not propagated to packages: ``` $ make --no-print-directory -C depends print-libevent_cxxflags CXXFLAGS=-some-fancy-flag libevent_cxxflags=-pipe -O2 ``` This PR: - propagates `{CPP,C,CXX,LD}FLAGS` to host packages: ``` $ make --no-print-directory -C depends print-libevent_cxxflags CXXFLAGS=-some-fancy-flag libevent_cxxflags= -some-fancy-flag ``` - does not propagate `{CPP,C,CXX,LD}FLAGS` to native packages: ``` $ make --no-print-directory -C depends print-native_b2_cxxflags CXXFLAGS=-some-fancy-flag native_b2_cxxflags= ``` - actually addresses the bitcoin#23551 (comment) ACKs for top commit: TheCharlatan: Code review ACK a3a2bd9 Tree-SHA512: 243d6b1b0e9c5de46debc36de62a77b6b4d6f638940fd530040c219956ec624e321b0c25290fed164e3a8c88befa7b97b20f765d7b9a428c269b3720f21da099
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
On master (4f8b1f8)
{CPP,C,CXX,LD}FLAGSthat are specified in the command line are not propagated to packages:This PR:
{CPP,C,CXX,LD}FLAGSto host packages:{CPP,C,CXX,LD}FLAGSto native packages: