Skip to content

PHPC-1174: Upgrade bundled libmongoc to 1.10.0 #841

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
merged 3 commits into from
May 22, 2018

Conversation

jmikola
Copy link
Member

@jmikola jmikola commented May 21, 2018

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

This should address the changes between our last submodule bump and 1.10. Also includes changes to config.w32 for Windows builds.

@jmikola jmikola requested a review from derickr May 21, 2018 16:58
YAJL was removed in libbson 1.6.0 (CDRIVER-1370).
@jmikola jmikola changed the title [WIP] PHPC-1174: Upgrade bundled libmongoc to 1.10.0 PHPC-1174: Upgrade bundled libmongoc to 1.10.0 May 21, 2018
Copy link
Contributor

@derickr derickr left a comment

Choose a reason for hiding this comment

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

lgtm, but I had a question. Also happy to see that there are no code changes needed.

@@ -58,44 +58,50 @@ if (PHP_MONGODB != "no") {
ADD_EXTENSION_DEP("mongodb", "openssl", false);

var PHP_MONGODB_CFLAGS="\
/D BSON_COMPILATION /D MONGOC_COMPILATION /D MONGOC_TRACE \
/D BSON_COMPILATION /D MONGOC_COMPILATION \
Copy link
Contributor

Choose a reason for hiding this comment

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

Did libmongoc remove the tracing?

Copy link
Member Author

Choose a reason for hiding this comment

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

This was moved to a mongoc-config.h constant.

@jmikola jmikola merged commit 093fe13 into mongodb:master May 22, 2018
jmikola added a commit that referenced this pull request May 22, 2018
@jmikola jmikola deleted the phpc-1174 branch May 22, 2018 12:30
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