Update submodule sources when building driver #1520
Conversation
alcaeus
force-pushed
the
update-submodule-sources-on-build
branch
from
210a907 to
b50a11b
Compare
| # If we're testing a specific version of libmongoc, update submodule sources | ||
| if [ -n "$LIBMONGOC_VERSION" ]; then | ||
| php scripts/update-submodule-sources.php | ||
| fi |
There was a problem hiding this comment.
Below we have a conditional for make libmongoc-version-current. I suppose that still needs to remain separate because phpize is what builds Makefile from Makefile.frag. So, at best, we could move that between the phpize and ./configure lines below.
And on a related note: the LIBMONGOC_VERSION_CURRENT file is actually referenced during ./configure to create the substitutions, so shouldn't we be running make libmongoc-version-current before ./configure? As-is, I don't think the compiled driver reports the correct version info.
Do you want to handle that in this same PR?
There was a problem hiding this comment.
Good point: LIBMONGOC_VERSION_CURRENT is indeed referenced during ./configure, but we have to run ./configure in order to have the Makefile generated. To avoid that conundrum, I now call phpize and ./configure, then run make libmongoc-version-current before running ./configure again to generate the final Makefile that we're building with. It's a little messy but the only way to work around the issue.
There was a problem hiding this comment.
I wouldn't complain if you want to just manually run:
cd src/libmongoc/ && python build/calc_release_version.py > ../LIBMONGOC_VERSION_CURRENT
And then you can leave a comment in both places (the Evergreen config and Makefile.frag) indicating that we should update both instances if it needs to change down the line.
alcaeus
force-pushed
the
update-submodule-sources-on-build
branch
from
e39a388 to
73ea471
Compare
|
Noted after merging that this takes care of PHPC-2006, so I'm linking that here. |
This PR adds a call to update-submodule-sources.php when compiling against a different version of libmongoc than the bundled one. This helps avoid "symbol not found" errors when compiling with libmongoc latest with new files not included in the bundled stable release.