Autotools: Simplify few PHP_ADD_BUILD_DIR calls #15783
Draft
+36
−37
Conversation
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
petk
requested review from
dstogov,
iluuu1994,
alexdowad and
youkidearitai
as code owners
|
This is still too ugly. I'll try also something else here. |
petk
force-pushed
the
patch-m4-PHP_EXT_BUILDDIR
branch
from
b842773 to
d2fba68
Compare
|
I think this will be a bit better now. These variables ext_srcdir, ext_builddir, ext_dir should be set when including the config m4 file and not when calling the PHP_NEW_EXTENSION. And this fixes also one missed PHP 8.4 bug in ext/gd with the include flag. |
The ext_builddir, ext_srdir, and ext_dir variables for the current extension are set after the PHP_NEW_EXTENSION is called. This now assignes them in config-stubs and phpize before including the extension's or SAPI+'s config m4 file' For example, this enables calling PHP_ADD_BUILD_DIR and some other macros before the PHP_NEW_EXTENSION and removes some redundant conditions. This also fixes missed bug in gd extension include flag.
petk
force-pushed
the
patch-m4-PHP_EXT_BUILDDIR
branch
from
e85cc37 to
02215c3
Compare
|
I'll target PHP 9 here with this as this config-stubs seems to be still a bit buggy. It echoes content several times when some file isn't found. |
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.
The $ext_builddir variable for the current extension is set after the PHP_NEW_EXTENSION is called. But there is also PHP_EXT_BUILDDIR macro which expands to the same value (defined in config-stubs and phpize), a relative path of the current extension or SAPI. This enables calling PHP_ADD_BUILD_DIR before the PHP_NEW_EXTENSION and removes some redundant conditions.