Skip to content
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

MONGOCRYPT-685 fix disabling patching and whitespace #837

Merged
merged 2 commits into from
Jun 17, 2024

Conversation

kevinAlbs
Copy link
Contributor

Summary

This is a follow-up to #818 to resolve two observed issues:

  • Configuring with LIBBSON_PATCH_ENABLED=OFF incorrectly disabled patching for IntelDFP.
  • Patching libbson failed on a local Windows build in non-Cygwin shell.

Prevents reading a prior value of `patch_disabled` set in the same scope.
To fix observed issue patching libbson on Windows (without Cygwin).
@kevinAlbs kevinAlbs marked this pull request as ready for review June 17, 2024 17:37
@kevinAlbs kevinAlbs requested a review from rcsanchez97 June 17, 2024 17:37
Copy link
Collaborator

@rcsanchez97 rcsanchez97 left a comment

Choose a reason for hiding this comment

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

Gotta love the eol dance.

@kevinAlbs kevinAlbs merged commit 5e49a13 into mongodb:master Jun 17, 2024
27 of 28 checks passed
kevinAlbs added a commit that referenced this pull request Jun 18, 2024
* set `patch_disabled` to OFF first

Prevents reading a prior value of `patch_disabled` set in the same scope.

* pass `--ignore-whitespace` to `git apply`

To fix observed issue patching libbson on Windows (without Cygwin).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants