Skip to content

[27.x] More backports #31422

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Feb 11, 2025
Merged

[27.x] More backports #31422

merged 5 commits into from
Feb 11, 2025
+20 −46

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Dec 4, 2024 •
edited
Loading

@0xB10C @fanquake
test: fix MIN macro-redefinition
166fea7 
Renames the `MIN` macro to `_TRACEPOINT_TEST_MIN`.

From bitcoin#31418:

```
stderr:
/virtual/main.c:70:9: warning: 'MIN' macro redefined [-Wmacro-redefined]
   70 | #define MIN(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; })
      |         ^
include/linux/minmax.h:329:9: note: previous definition is here
  329 | #define MIN(a,b) __cmp(min,a,b)
      |         ^
1 warning generated.
```

fixes: bitcoin#31418

Github-Pull: bitcoin#31419
Rebased-From: 00c1dbd
@fanquake fanquake force-pushed the some_more_27_backports branch from 6d7bc9d to 01adb69 Compare January 6, 2025 10:58
@DrahtBot
Copy link
Contributor

DrahtBot commented Jan 6, 2025 •
edited
Loading

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

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK stickies-v

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

@hebasto @fanquake
depends: Fix CXXFLAGS on NetBSD
c70bd78 
This change corrects an issue where CXXFLAGS were mistakenly overridden
by CFLAGS.

Github-Pull: bitcoin#31502
Rebased-From: a10bb40
@fanquake fanquake force-pushed the some_more_27_backports branch from 01adb69 to 86ee080 Compare January 6, 2025 11:00
hebasto and others added 2 commits January 10, 2025 17:04
@hebasto @fanquake
depends: Fix spacing issue
a1db79c 
This change resolves an issue where a missing space caused the value of
the `build_AR` variable to be concatenated with the "NM=" string. This
resulted in subsequent calls to `${AR}` and `${NM}` failing.

Github-Pull: bitcoin#31627
Rebased-From: 8a46286
@0xB10C @fanquake
tracing: Rename the MIN macro to _TRACEPOINT_TEST_MIN in log_raw_…
8588d5b 
…p2p_msgs

Inspired by: 00c1dbd (bitcoin#31419)

Github-Pull: bitcoin#31623
Rebased-From: f93f0c9
@fanquake fanquake force-pushed the some_more_27_backports branch from 86ee080 to 78bf705 Compare January 10, 2025 17:06
@fanquake fanquake force-pushed the some_more_27_backports branch from 78bf705 to 25f1503 Compare February 10, 2025 10:43
@fanquake fanquake marked this pull request as ready for review February 10, 2025 10:51
@fanquake fanquake requested a review from stickies-v February 10, 2025 10:51
stickies-v
stickies-v approved these changes Feb 10, 2025
View reviewed changes
Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

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

ACK 25f1503

I've verified that all backported commits are clean, and they seem sensible. The CI failure seems unrelated, and I could not reproduce locally with ./test/functional/test_runner.py --previous-releases --filter wallet_upgradewallet. It was reported in #31210 and fixed in #30125, but backporting the (quite extensive) fix commit probably is not necessary for this PR?

@fanquake
Copy link
Member Author

probably is not necessary for this PR?

I agree, I'm not planning on backporting that here.

@fanquake fanquake merged commit 1e7041a into bitcoin:27.x Feb 11, 2025
15 of 16 checks passed
@fanquake fanquake deleted the some_more_27_backports branch February 11, 2025 12:24
@fanquake fanquake added this to the 27.3 milestone Jun 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@stickies-v stickies-v stickies-v approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
Backport CI failed
Projects
None yet
Milestone
27.3
Development

Successfully merging this pull request may close these issues.
5 participants
@fanquake @DrahtBot @stickies-v @0xB10C @hebasto