Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

PHPC-1496: Add support for compiling with libmongocrypt #1065

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
alcaeus merged 1 commit into mongodb:master from alcaeus:phpc-1496
Jan 8, 2020

Conversation

@alcaeus
Copy link
Member

@alcaeus alcaeus commented Nov 27, 2019 •
edited
Loading

https://jira.mongodb.org/browse/PHPC-1496

Commits will be squashed before merging.

Open items:

  • Remove symlink workaround with src/libmongocrypt-tmp (see CDRIVER-3439)
  • Generate mongocrypt-export.h automatically
  • Create correct mongocrypt-export.h
  • Compile on Windows
  • Double-check logic on libmongocrypt auto detection to avoid failures in auto-mode
  • Determine correct libmongocrypt version when compiling
  • Show libmongocrypt output for phpinto
  • Document updating libmongocrypt in contributing.md
  • Update PECL package generation script
  • Ensure libmongocrypt is built with crypto support and reports it correctly (issue found on MacOS)
  • Ensure libmongocrypt with crypto works properly on Windows (may currently implicitly use crypto_none)
  • Update to latest libmongocrypt version and remove conditional compiles

@alcaeus alcaeus self-assigned this Nov 27, 2019
@alcaeus alcaeus force-pushed the phpc-1496 branch 4 times, most recently from 1e33b00 to cb73b1b Compare November 28, 2019 13:05
@jmikola jmikola self-requested a review December 4, 2019 15:18
@alcaeus alcaeus changed the title (削除) [WIP] PHPC-1496: Add support for compiling with libmongocrypt (削除ここまで) (追記) PHPC-1496: Add support for compiling with libmongocrypt (追記ここまで) Dec 5, 2019
Copy link
Member Author

alcaeus commented Dec 16, 2019

Regarding the todo item "Ensure libmongocrypt is built with crypto support and reports it correctly (issue found on MacOS)", this is due to us not including mongocrypt-config.h in php_phongo.c, so MONGOCRYPT_ENABLE_CRYPTO is never defined. Since the header file is not available when using system libmongocrypt, I've removed the phpinfo output for libmongocrypt crypto.

Since we are using the same library as for libmongoc crypto, it may be more appropriate to rename that output from "libmongoc crypto" to something more generic that covers both libmongoc and libmongocrypt.

Copy link
Member

jmikola commented Dec 20, 2019

Incoming PR: alcaeus#3

Copy link
Member

@jmikola jmikola left a comment

Choose a reason for hiding this comment

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

One formatting suggestion. LGTM otherwise!

Copy link
Member Author

alcaeus commented Dec 20, 2019

Done. I also squashed commits for a cleaner history 👍
jmikola reacted with thumbs up emoji

alcaeus added a commit that referenced this pull request Jan 8, 2020
@alcaeus alcaeus merged commit 7cea21a into mongodb:master Jan 8, 2020
@alcaeus alcaeus deleted the phpc-1496 branch January 8, 2020 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jmikola jmikola jmikola approved these changes

+1 more reviewer

@kevinAlbs kevinAlbs kevinAlbs left review comments

Reviewers whose approvals may not affect merge requirements

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /