main/php_ini.c: build empty php_load_zend_extension_cb() when !HAVE_L…#3161
Closed
tpetazzoni wants to merge 1 commit into
Closed
main/php_ini.c: build empty php_load_zend_extension_cb() when !HAVE_L…#3161tpetazzoni wants to merge 1 commit into
tpetazzoni wants to merge 1 commit into
Conversation
…IBDL Commit 0782a7f ("Fixed bug #74866 extension_dir = "./ext" now use current directory for base") modified the php_load_zend_extension_cb() function to use php_load_shlib(), and pass a handle to the newly introduced zend_load_extension_handle() function instead of passing the extension path to zend_load_extension(). While doing so, it introduced a call to php_load_shlib() from code that is built even when HAVE_LIBDL is not defined. However, php_load_shlib() is not implemented when HAVE_LIBDL is not defined, for obvious reasons. It turns out that zend_load_extension_handle() anyway doesn't do anything when ZEND_EXTENSIONS_SUPPORT is defined to 0, and ZEND_EXTENSIONS_SUPPORT is not defined when HAVE_LIBDL is not defined (Zend/zend_portability.h). Fixes the following build failure when building on a system that doesn't have libdl: main/php_ini.o: In function `php_load_zend_extension_cb': php_ini.c:(.text+0x478): undefined reference to `php_load_shlib' php_ini.c:(.text+0x4b0): undefined reference to `php_load_shlib' collect2: error: ld returned 1 exit status Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
nikic
approved these changes
Mar 23, 2018
Member
|
Sorry for the delay, merged as 2842aa2 into 7.2+, where these changes were introduced. Thanks! |
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
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.
…IBDL
Commit 0782a7f ("Fixed bug #74866
extension_dir = "./ext" now use current directory for base") modified
the php_load_zend_extension_cb() function to use php_load_shlib(), and
pass a handle to the newly introduced zend_load_extension_handle()
function instead of passing the extension path to
zend_load_extension().
While doing so, it introduced a call to php_load_shlib() from code
that is built even when HAVE_LIBDL is not defined. However,
php_load_shlib() is not implemented when HAVE_LIBDL is not defined,
for obvious reasons.
It turns out that zend_load_extension_handle() anyway doesn't do
anything when ZEND_EXTENSIONS_SUPPORT is defined to 0, and
ZEND_EXTENSIONS_SUPPORT is not defined when HAVE_LIBDL is not defined
(Zend/zend_portability.h).
Fixes the following build failure when building on a system that
doesn't have libdl:
main/php_ini.o: In function
php_load_zend_extension_cb': php_ini.c:(.text+0x478): undefined reference tophp_load_shlib'php_ini.c:(.text+0x4b0): undefined reference to `php_load_shlib'
collect2: error: ld returned 1 exit status
Signed-off-by: Thomas Petazzoni thomas.petazzoni@bootlin.com