Skip to content

revert: Revert "Merge bitcoin/bitcoin#28461: build: Windows SSP roundup" #6682

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 1 commit into from
May 26, 2025
Merged

revert: Revert "Merge bitcoin/bitcoin#28461: build: Windows SSP roundup" #6682

merged 1 commit into from
May 26, 2025

Conversation

UdjinM6
Copy link

@UdjinM6 UdjinM6 commented May 24, 2025

Issue being fixed or feature implemented

Backporting 28461 in #6641 broke Guix build.

What was done?

Revert ea32090.

How Has This Been Tested?

develop: https://github.com/UdjinM6/dash/actions/runs/15217141785
this PR: https://github.com/UdjinM6/dash/actions/runs/15219875769

Breaking Changes

n/a

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

@UdjinM6 UdjinM6 added this to the 23 milestone May 24, 2025
@coderabbitai coderabbitai
Copy link

coderabbitai bot commented May 24, 2025

Walkthrough

The changes introduce adjustments to the build configuration for environments targeting MinGW. In configure.ac, a conditional check is added to verify the presence of the libssp library when building for MinGW, halting the configuration with an error if it is missing. In contrib/guix/manifest.scm, the --enable-default-ssp=yes flag is removed from the configure flags for mingw-w64-base-gcc, and instead, the gcc_cv_libc_provides_ssp=yes cache variable is set in the make flags to indicate that SSP support is provided by the C library. No changes are made to public or exported entity declarations.

Note

⚡️ AI Code Reviews for VS Code, Cursor, Windsurf

CodeRabbit now has a plugin for VS Code, Cursor and Windsurf. This brings AI code reviews directly in the code editor. Each commit is reviewed immediately, finding bugs before the PR is raised. Seamless context handoff to your AI code agent ensures that you can easily incorporate review feedback.
Learn more here.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between da8a475 and acddde7.

📒 Files selected for processing (2)
  • configure.ac (1 hunks)
  • contrib/guix/manifest.scm (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (4)
  • GitHub Check: mac-build / Build source
  • GitHub Check: arm-linux-build / Build source
  • GitHub Check: linux64_nowallet-build / Build source
  • GitHub Check: win64-build / Build source
🔇 Additional comments (2)
configure.ac (1)

1041-1045: LGTM: Well-implemented library check for MinGW SSP support.

This change adds a necessary check for the libssp library specifically for MinGW hosts within the hardening configuration section. The implementation is correct and follows autotools conventions. This works in coordination with the changes in contrib/guix/manifest.scm to properly handle Stack Smashing Protection (SSP) configuration for MinGW builds, ensuring that the required library is available when needed.

The placement within the hardening section after other linker flag checks is appropriate, and the clear error message will help users understand missing dependencies.

contrib/guix/manifest.scm (1)

431-435: Excellent solution for SSP configuration in MinGW builds.

This change elegantly solves the SSP (Stack Smashing Protection) configuration issue by setting the gcc_cv_libc_provides_ssp=yes cache variable at make time. This approach:

  1. Avoids linking against libssp.so - which would cause symbol-check script failures
  2. Uses glibc's SSP functions - a more appropriate choice for the build environment
  3. Maintains security features - while ensuring build compatibility

The implementation correctly follows Guix package definition patterns and the explanatory comment clearly documents the rationale. This works well in coordination with the configure.ac changes to provide a complete solution for the Guix build issue.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

kwvg
kwvg approved these changes May 25, 2025
View reviewed changes
Copy link
Collaborator

@kwvg kwvg left a comment

Choose a reason for hiding this comment

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

ACK acddde7

@PastaPastaPasta
Copy link
Member

Hmm; I'd prefer to fix the bug now that we've merged it as opposed to simply reverting. Can you identify any fix? did bitcoin run into this? is it just too soon?

@UdjinM6 UdjinM6 mentioned this pull request May 26, 2025
Merged
5 tasks
@UdjinM6
Copy link
Author

UdjinM6 commented May 26, 2025

I think it's just too early but couldn't figure out which related backports are missing exactly 🤷‍♂️ There is no rush to merge it though. We can keep backporting hoping it would fix it and postpone this PR till we actually have to build some binaries via Guix.

PastaPastaPasta
PastaPastaPasta approved these changes May 26, 2025
View reviewed changes
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK acddde7

@PastaPastaPasta PastaPastaPasta merged commit 66c1774 into dashpay:develop May 26, 2025
33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

@kwvg kwvg kwvg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
23
Development

Successfully merging this pull request may close these issues.
3 participants
@UdjinM6 @PastaPastaPasta @kwvg