PHPC-2382: Allow static builds with php-src #1555
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,19 +24,28 @@ if test "$PHP_MONGODB" != "no"; then | |
| dnl Check PHP version is compatible with this extension | ||
| AC_MSG_CHECKING([PHP version]) | ||
|
|
||
| if test -z "${PHP_VERSION_ID}"; then | ||
| if test -z "$PHP_CONFIG"; then | ||
| AC_MSG_ERROR([php-config not found]) | ||
| fi | ||
|
|
||
| PHP_MONGODB_PHP_VERSION=`${PHP_CONFIG} --version` | ||
| PHP_MONGODB_PHP_VERSION_ID=`${PHP_CONFIG} --vernum` | ||
| else | ||
| PHP_MONGODB_PHP_VERSION="${PHP_VERSION}" | ||
| PHP_MONGODB_PHP_VERSION_ID="${PHP_VERSION_ID}" | ||
| fi | ||
|
|
||
| AC_MSG_RESULT($PHP_MONGODB_PHP_VERSION) | ||
|
|
||
| if test "$PHP_MONGODB_PHP_VERSION_ID" -lt "70400"; then | ||
| AC_MSG_ERROR([not supported. Need a PHP version >= 7.4.0 (found $PHP_MONGODB_PHP_VERSION)]) | ||
| fi | ||
|
|
||
| PHP_MONGODB_STD_CFLAGS="" | ||
| PHP_MONGODB_DEV_CFLAGS="" | ||
| PHP_MONGODB_COVERAGE_CFLAGS="" | ||
|
There was a problem hiding this comment. Using prefixes and initializing these vars ensures we won't inherit state during a static build (admittedly unlikely). |
||
|
|
||
| PHP_ARG_ENABLE([mongodb-developer-flags], | ||
| [whether to enable developer build flags], | ||
| [AS_HELP_STRING([--enable-mongodb-developer-flags], | ||
|
|
@@ -46,54 +55,53 @@ if test "$PHP_MONGODB" != "no"; then | |
| PHP_MONGODB_VALIDATE_ARG([PHP_MONGODB_DEVELOPER_FLAGS], [yes no]) | ||
|
|
||
| if test "$PHP_MONGODB_DEVELOPER_FLAGS" = "yes"; then | ||
| PHP_MONGODB_STD_CFLAGS="-g -O0 -Wall" | ||
|
|
||
| dnl Warn about functions which might be candidates for format attributes | ||
| AX_CHECK_COMPILE_FLAG(-Wmissing-format-attribute, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wmissing-format-attribute" ,, -Werror) | ||
| dnl Avoid duplicating values for an enum | ||
| AX_CHECK_COMPILE_FLAG(-Wduplicate-enum, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wduplicate-enum" ,, -Werror) | ||
| dnl Warns on mismatches between #ifndef and #define header guards | ||
| AX_CHECK_COMPILE_FLAG(-Wheader-guard, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wheader-guard" ,, -Werror) | ||
| dnl logical not of a non-boolean expression | ||
| AX_CHECK_COMPILE_FLAG(-Wlogical-not-parentheses, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wlogical-not-parentheses" ,, -Werror) | ||
| dnl Warn about suspicious uses of logical operators in expressions | ||
| AX_CHECK_COMPILE_FLAG(-Wlogical-op, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wlogical-op" ,, -Werror) | ||
| dnl memory error detector. | ||
| dnl FIXME: -fsanitize=address,undefined for clang. The AX_CHECK_COMPILE_FLAG macro isn't happy about that string :( | ||
| AX_CHECK_COMPILE_FLAG(-fsanitize-address, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -fsanitize-address" ,, -Werror) | ||
| dnl Enable frame debugging | ||
| AX_CHECK_COMPILE_FLAG(-fno-omit-frame-pointer, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -fno-omit-frame-pointer" ,, -Werror) | ||
| dnl Make sure we don't optimize calls | ||
| AX_CHECK_COMPILE_FLAG(-fno-optimize-sibling-calls, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -fno-optimize-sibling-calls" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wlogical-op-parentheses, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wlogical-op-parentheses" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wpointer-bool-conversion, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wpointer-bool-conversion" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wbool-conversion, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wbool-conversion" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wloop-analysis, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wloop-analysis" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wsizeof-array-argument, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wsizeof-array-argument" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wstring-conversion, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wstring-conversion" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wno-variadic-macros, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wno-variadic-macros" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wno-sign-compare, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wno-sign-compare" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-fstack-protector, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -fstack-protector" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-fno-exceptions, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -fno-exceptions" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wformat-security, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wformat-security" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wformat-nonliteral, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wformat-nonliteral" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Winit-self, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Winit-self" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wwrite-strings, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wwrite-strings" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wenum-compare, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wenum-compare" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wempty-body, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wempty-body" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wparentheses, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wparentheses" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wmaybe-uninitialized, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wmaybe-uninitialized" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wimplicit-fallthrough, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wimplicit-fallthrough" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Werror, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Werror" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wextra, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wextra" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wno-unused-parameter, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wno-unused-parameter" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wno-unused-but-set-variable, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wno-unused-but-set-variable" ,, -Werror) | ||
| AX_CHECK_COMPILE_FLAG(-Wno-missing-field-initializers, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wno-missing-field-initializers",, -Werror) | ||
|
|
||
| if test "$PHP_MONGODB_PHP_VERSION_ID" -ge "80108"; then | ||
| AX_CHECK_COMPILE_FLAG(-Wstrict-prototypes, PHP_MONGODB_DEV_CFLAGS="$PHP_MONGODB_DEV_CFLAGS -Wstrict-prototypes",, -Werror) | ||
| fi | ||
|
There was a problem hiding this comment. The reasons for these names are lost to time, but since I'm now initializing |
||
| fi | ||
|
|
||
|
|
||
|
|
@@ -110,13 +118,11 @@ if test "$PHP_MONGODB" != "no"; then | |
| AC_MSG_ERROR(code coverage is not supported for static builds) | ||
| fi | ||
|
|
||
|
There was a problem hiding this comment. This variable had no purpose beyond injection into |
||
| PHP_MONGODB_COVERAGE_CFLAGS="--coverage -g" | ||
| MONGODB_SHARED_LIBADD="$MONGODB_SHARED_LIBADD --coverage" | ||
| fi | ||
|
|
||
| PHP_MONGODB_CFLAGS="$PHP_MONGODB_STD_CFLAGS $PHP_MONGODB_DEV_CFLAGS $PHP_MONGODB_COVERAGE_CFLAGS" | ||
|
|
||
| PHP_MONGODB_SOURCES="\ | ||
| php_phongo.c \ | ||
|
|
@@ -307,7 +313,7 @@ if test "$PHP_MONGODB" != "no"; then | |
| fi | ||
|
|
||
| if test "$PHP_MONGODB_SYSTEM_LIBS" = "no"; then | ||
| PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_STD_CFLAGS -DBSON_COMPILATION -DMONGOC_COMPILATION" | ||
|
|
||
| dnl CheckUtf8Proc.m4 will modify this when using bundled utf8proc | ||
| PHP_MONGODB_UTF8PROC_CFLAGS="" | ||
|
|
@@ -318,6 +324,9 @@ if test "$PHP_MONGODB" != "no"; then | |
| dnl Endian.m4 will modify this when using bundled libmongocrypt | ||
| PHP_MONGODB_LIBMONGOCRYPT_CFLAGS="" | ||
|
|
||
| dnl Save CPPFLAGS, which PlatformFlags.m4 modifies for subsequent M4 scripts | ||
| old_CPPFLAGS="$CPPFLAGS" | ||
|
|
||
| dnl Avoid using AC_CONFIG_MACRO_DIR, which might conflict with PHP | ||
| m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/m4/ax_check_compile_flag.m4) | ||
| m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/m4/ax_prototype.m4) | ||
|
|
@@ -350,6 +359,9 @@ if test "$PHP_MONGODB" != "no"; then | |
| m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libmongocrypt/Endian.m4) | ||
| m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libmongocrypt/Version.m4) | ||
|
|
||
| dnl Restore CPPFLAGS once all M4 scripts have executed | ||
| CPPFLAGS="$old_CPPFLAGS" | ||
|
There was a problem hiding this comment. This is the actual change proposed and validated in #1549 (comment). I've just reduced the scope to the M4 files instead of the entire |
||
|
|
||
| PHP_MONGODB_BSON_VERSION_STRING="Bundled ($libbson_VERSION_FULL)" | ||
| PHP_MONGODB_MONGOC_VERSION_STRING="Bundled ($libmongoc_VERSION_FULL)" | ||
| PHP_MONGODB_MONGOCRYPT_VERSION_STRING="Bundled ($MONGOCRYPT_BUILD_VERSION)" | ||
|
|
@@ -509,7 +521,6 @@ if test "$PHP_MONGODB" != "no"; then | |
| dnl This must come after PHP_NEW_EXTENSION, otherwise the srcdir won't be set | ||
| PHP_ADD_MAKEFILE_FRAGMENT | ||
|
|
||
| AC_CONFIG_COMMANDS_POST([ | ||
| if test "$enable_static" = "no"; then | ||
| echo " | ||
|
|
@@ -518,9 +529,10 @@ mongodb was configured with the following options: | |
| Build configuration: | ||
| CC : $CC | ||
| CFLAGS : $CFLAGS | ||
| CPPFLAGS : $CPPFLAGS | ||
| Extra flags : $PHP_MONGODB_STD_CFLAGS | ||
| Developer flags (slow) : $PHP_MONGODB_DEV_CFLAGS | ||
| Code Coverage flags (extra slow : $PHP_MONGODB_COVERAGE_CFLAGS | ||
jmikola marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| libmongoc : $PHP_MONGODB_BSON_VERSION_STRING | ||
| libbson : $PHP_MONGODB_MONGOC_VERSION_STRING | ||
| libmongocrypt : $PHP_MONGODB_MONGOCRYPT_VERSION_STRING | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,12 +18,4 @@ AS_IF([test "$os_darwin" = "yes"],[ | |
| dnl https://opensource.apple.com/source/Libc/Libc-1439.40.11/gen/compat.5.auto.html | ||
| CPPFLAGS="$CPPFLAGS -D_DARWIN_C_SOURCE" | ||
| PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS -D_DARWIN_C_SOURCE" | ||
|
There was a problem hiding this comment. All of the This line in particular was based on old behavior in libmongoc, which still persists in the current CMake config. I opened CDRIVER-5576 to report that, as it's likely obsolete. The fact that this code never ran and we received no reports would support that hypothesis. |
||
| ]) | ||
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I successfully ran
./configureon Alpine using thephp:8.2-alpineDocker image. Referred back to instructions in #1477 (comment).This still works, although it did reveal a bug in the build config output where we print "Bundled ()" when libmongocrypt isn't configured. Opened PHPC-2386 to track that.