Merge v2.3 into v2.x#2015
Merged
mongodb-drivers-pr-bot[bot] merged 1 commit intov2.xfrom May 5, 2026
Merged
Conversation
…ne vs. in-tree, in-source vs. out-of-source) (#2014) * PHPC-2647: Write generated config headers to extension build directory Use PHP_EXT_BUILDDIR as the base for all AC_CONFIG_FILES paths so that generated config headers (common-config.h, bson/config.h, mongoc-config.h, etc.) are written to the extension's build directory rather than its source directory, keeping the source tree clean for out-of-source builds. Add PHP_MONGODB_ADD_BUILD_INCLUDE to php_mongodb.m4 as the counterpart to PHP_MONGODB_ADD_INCLUDE: it adds a compiler include path relative to the extension build directory (PHP_EXT_BUILDDIR), which is needed so the compiler can find the generated config headers regardless of whether the build is in-source or out-of-source. Call PHP_MONGODB_ADD_BUILD_INCLUDE for each directory that receives a generated header via AC_CONFIG_FILES: common/src, libbson/src/bson, libmongoc/src/mongoc, and conditionally zlib-1.3.1 and libmongocrypt/src. * Test both in-source and out-of-source for in-tree builds * Correctly expand build directory before adding as include * Fail on unsupported modes * Fix comment to match matrix value (in-source, not from-source)
mongodb-drivers-pr-bot
Bot
requested review from
GromNaN
and removed request for
a team
❌ 1 Tests Failed:
View the top 1 failed test(s) by shortest run time
To view more test analytics, go to the Test Analytics Dashboard |
alcaeus
approved these changes
May 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge new changes from v2.3 into v2.x.
Commits
To resolve any conflicts, check out the temporary branch and run the following command:Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:Ignoring changes
Then, push the temporary branch to upate the pull request.