Skip to content

PHPC-2638 and PHPC-2630: Bump to libmongoc 2.1.2 and libmongocrypt 1.16.0 #1868

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 7 commits into from
Oct 17, 2025
Merged

PHPC-2638 and PHPC-2630: Bump to libmongoc 2.1.2 and libmongocrypt 1.16.0 #1868

merged 7 commits into from
Oct 17, 2025

Conversation

@jmikola
Copy link
Member

@jmikola jmikola commented Sep 12, 2025 •
edited
Loading

https://jira.mongodb.org/browse/PHPC-2638
https://jira.mongodb.org/browse/PHPC-2630

The libmongocrypt upgrade is necessary due to a collision between "mlib" headers in libmongoc and libmongocrypt (addressed in MONGOCRYPT-845).

@jmikola jmikola requested a review from a team as a code owner September 12, 2025 16:06
@jmikola jmikola requested review from alcaeus and removed request for a team September 12, 2025 16:06
alcaeus
alcaeus reviewed Sep 15, 2025
View reviewed changes
@jmikola jmikola changed the title PHPC-2611: Bump to libmongoc 2.1.0 and libmongocrypt 1.15.2-dev PHPC-2611 and PHPC-2626: Bump to libmongoc 2.1.0 and libmongocrypt 1.15.2 Sep 15, 2025
@jmikola jmikola force-pushed the phpc-2611-libmongoc-2.1 branch from 7fe0f9e to 3f7be27 Compare September 15, 2025 20:46
@jmikola jmikola force-pushed the phpc-2611-libmongoc-2.1 branch 2 times, most recently from 990c7fe to a79eab9 Compare September 16, 2025 18:34
@jmikola
Copy link
Member Author

jmikola commented Sep 17, 2025 •
edited
Loading

Note: we've got two regularly failing builds on Windows 8.4 x86 (nts and ts) due to:

C1060: compiler is out of heap space

The most recent failures are at mongoc-handshake.c:702 but I'm not sure how pertinent that is. Will come back to this and investigate further.

@jmikola jmikola mentioned this pull request Sep 22, 2025
Open
@jmikola jmikola mentioned this pull request Oct 8, 2025
Merged
@jmikola jmikola force-pushed the phpc-2611-libmongoc-2.1 branch from a79eab9 to 13515f7 Compare October 10, 2025 14:03
@jmikola jmikola changed the title PHPC-2611 and PHPC-2626: Bump to libmongoc 2.1.0 and libmongocrypt 1.15.2 PHPC-2611 and PHPC-2626: Bump to libmongoc 2.1.2 and libmongocrypt 1.16.0 Oct 10, 2025
@jmikola
PHPC-2611: Bump libmongoc to 2.1.2
6959b4c
@jmikola
PHPC-2626: Bump libmongocrypt to 1.16.0
3e06863 
This pulls in changes from MONGOCRYPT-845, which are necessary to produce a static build with both libmongoc 2.1.x and libmongocrypt (due to a conflict in the "mlib" headers).
@jmikola jmikola force-pushed the phpc-2611-libmongoc-2.1 branch 5 times, most recently from 9126259 to 2f95be6 Compare October 14, 2025 20:07
GromNaN
GromNaN reviewed Oct 14, 2025
View reviewed changes
@jmikola jmikola force-pushed the phpc-2611-libmongoc-2.1 branch 2 times, most recently from 7a3346a to e398106 Compare October 15, 2025 01:11
@jmikola jmikola changed the title PHPC-2611 and PHPC-2626: Bump to libmongoc 2.1.2 and libmongocrypt 1.16.0 PHPC-2638 and PHPC-2630: Bump to libmongoc 2.1.2 and libmongocrypt 1.16.0 Oct 15, 2025
GromNaN
GromNaN reviewed Oct 15, 2025
View reviewed changes
.gitmodules Outdated
Comment on lines 3 to 5
url = https://github.com/jmikola/mongo-c-driver.git
ignore = untracked
branch = 2.1.2-handshake
Copy link
Member

Choose a reason for hiding this comment

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

Is the fix you added on your branch necessary for this PR?

Copy link
Member Author

@jmikola jmikola Oct 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I'm still attempting to isolate the OOM compiler error in order to provide meaningful feedback to the C team. It's likely this is the result of ludicrous macro expansion in their BSON DSL (see mongoc-handshake.c in mongodb/mongo-c-driver@f142c61).

Copy link
Member Author

Choose a reason for hiding this comment

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

Quoting How to: Enable a 64-Bit, x64 hosted MSVC toolset on the command line:

If you run into memory limits when you use the 32-bit tools, try the 64-bit tools.

Hat tip to @kevinAlbs.

@jmikola
Cross-compile 32-bit Windows builds using 64-bit toolset
d6ab8c9 
This should avoid memory limits when using 32-bit tools, which is relevant for libmongoc sources using the BSON DSL API.
If you run into memory limits when you use the 32-bit tools, try the 64-bit tools.
@jmikola jmikola force-pushed the phpc-2611-libmongoc-2.1 branch from 0543a2f to d6ab8c9 Compare October 17, 2025 12:49
@jmikola jmikola merged commit 88734c5 into mongodb:v2.x Oct 17, 2025
71 checks passed
@jmikola jmikola deleted the phpc-2611-libmongoc-2.1 branch October 17, 2025 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alcaeus alcaeus alcaeus approved these changes

@GromNaN GromNaN GromNaN approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jmikola @alcaeus @GromNaN