[27.x] More backports #31422

pull fanquake wants to merge 5 commits into bitcoin:27.x from fanquake:some_more_27_backports changing 5 files +20 −46
  1. fanquake commented at 5:35 pm on December 4, 2024: member

    Backports:

  2. test: fix MIN macro-redefinition
    Renames the `MIN` macro to `_TRACEPOINT_TEST_MIN`.
    
    From #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: https://github.com/bitcoin/bitcoin/issues/31418
    
    Github-Pull: #31419
    Rebased-From: 00c1dbd26ddb816e5541c5724397015a92a3d06b
    166fea73eb
  3. fanquake force-pushed on Jan 6, 2025
  4. DrahtBot commented at 10:58 am on January 6, 2025: contributor

    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.

  5. DrahtBot added the label Backport on Jan 6, 2025
  6. depends: Fix CXXFLAGS on NetBSD
    This change corrects an issue where CXXFLAGS were mistakenly overridden
    by CFLAGS.
    
    Github-Pull: #31502
    Rebased-From: a10bb400e8cb0da0030114ee59f2e7c8494aef42
    c70bd786f8
  7. fanquake force-pushed on Jan 6, 2025
  8. depends: Fix spacing issue
    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: #31627
    Rebased-From: 8a46286da667d19414c30350df48ebf245589e32
    a1db79c31d
  9. tracing: Rename the `MIN` macro to `_TRACEPOINT_TEST_MIN` in log_raw_p2p_msgs
    Inspired by: 00c1dbd26ddb816e5541c5724397015a92a3d06b (#31419)
    
    Github-Pull: #31623
    Rebased-From: f93f0c93961bbce413101c2a92300a7a29277506
    8588d5bbe0
  10. fanquake force-pushed on Jan 10, 2025
  11. doc: update release notes 25f150304d
  12. fanquake force-pushed on Feb 10, 2025
  13. fanquake marked this as ready for review on Feb 10, 2025
  14. fanquake requested review from stickies-v on Feb 10, 2025
  15. DrahtBot added the label CI failed on Feb 10, 2025
  16. stickies-v approved
  17. stickies-v commented at 9:02 pm on February 10, 2025: contributor

    ACK 25f150304d01940d7936125b7b4bf8e6c01d35aa

    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?

  18. fanquake commented at 11:55 am on February 11, 2025: member

    probably is not necessary for this PR?

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

  19. fanquake merged this on Feb 11, 2025
  20. fanquake closed this on Feb 11, 2025

  21. fanquake deleted the branch on Feb 11, 2025

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2025-03-09 21:13 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me