8000 [28.x] Backports by fanquake · Pull Request #32299 · bitcoin/bitcoin · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[28.x] Backports #32299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 13, 2025
Merged

[28.x] Backports #32299

merged 6 commits into from
May 13, 2025

Conversation

BrandonOdiwuor and others added 3 commits April 17, 2025 13:08
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
@fanquake fanquake added this to the 28.2 milestone Apr 17, 2025
@DrahtBot
Copy link
Contributor
DrahtBot commented Apr 17, 2025

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/32299.

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.

This is required for the next commit.

Github-Pull: bitcoin#32336
Rebased-From: fa0c1ba
-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: bitcoin#32336
Rebased-From: facb9b3
@fanquake fanquake marked this pull request as ready for review May 12, 2025 18:51
@fanquake fanquake requested a review from willcl-ark May 12, 2025 18:51
Copy link
Member
@willcl-ark willcl-ark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

crACK a325ca3

Backports all look clean to me.

Would only check that #32336 was left out of the release notes intentionally (it's not really "notable")?

@fanquake
Copy link
Member Author

was left out of the release notes

Fixed that up.

Copy link
Member
@willcl-ark willcl-ark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 812e637

Only changes to release note since previous ACK.

@fanquake fanquake merged commit a124b91 into bitcoin:28.x May 13, 2025
11 of 16 checks passed
@fanquake fanquake deleted the 28_x_backports branch May 13, 2025 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants
0