Fix GH-15381: Autotools: Refactor main/internal_functions commands#15514
Closed
petk wants to merge 1 commit intophp:masterfrom
Closed
Fix GH-15381: Autotools: Refactor main/internal_functions commands#15514petk wants to merge 1 commit intophp:masterfrom
petk wants to merge 1 commit intophp:masterfrom
Conversation
This wraps generation of main/internal_functions* files into a separate AC_CONFIG_COMMANDS and uses a SHELL variable instead of sh command. Autoconf sets the SHELL variable to a suitable current shell the configure is running in. Instead of putting the commands into the 2nd argument the 3rd initialization argument is used like before because it is easier to read and work with variables (AWK, EXT_STATIC and EXT_CLI_STATIC), which would need to be assigned again for the 2nd argument. This simplifies the configure usage on Solaris 10 C shell and KornShell without issuing errors when executing genif.sh script.
Member
Author
|
And for the PHP-8.2 and PHP-8.3 branches I'll add this patch: diff --git a/configure.ac b/configure.ac
index ff96b307d6..4da093e9b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1819,9 +1819,9 @@ cat >Zend/zend_config.h <<FEO
FEO
echo "creating main/internal_functions.c"
-AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
+AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
echo "creating main/internal_functions_cli.c"
-AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
+AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
])
AC_OUTPUT |
petk
added a commit
that referenced
this pull request
Aug 21, 2024
Autoconf assigns the current suitable shell to SHELL variable. This notably fixes cases on Solaris 10 when using C shell or KornShell where genif.sh: syntax error at line 35 occurs due to using the `sh` command.
petk
added a commit
that referenced
this pull request
Aug 21, 2024
* PHP-8.2: Fix bug GH-15514 (Configure error: genif.sh: syntax error)
petk
added a commit
that referenced
this pull request
Aug 21, 2024
* PHP-8.3: Fix bug GH-15514 (Configure error: genif.sh: syntax error) Autotools: Refactor main/internal_functions commands This wraps generation of main/internal_functions* files into a separate AC_CONFIG_COMMANDS and uses a SHELL variable instead of sh command. Autoconf sets the SHELL variable to a suitable current shell the configure is running in. Instead of putting the commands into the 2nd argument the 3rd initialization argument is used like before because it is easier to read and work with variables (AWK, EXT_STATIC and EXT_CLI_STATIC), which would need to be assigned again for the 2nd argument. This simplifies the configure usage on Solaris 10 C shell and KornShell without issuing errors when executing genif.sh script.
Member
Author
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
1 participant
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.
This wraps generation of main/internal_functions* files into a separate AC_CONFIG_COMMANDS and uses a SHELL variable instead of sh command. Autoconf sets the SHELL variable to a suitable current shell the configure is running in.
Instead of putting the commands into the 2nd argument the 3rd initialization argument is used like before because it is easier to read and work with variables (AWK, EXT_STATIC and EXT_CLI_STATIC), which would need to be assigned again for the 2nd argument.
This simplifies the configure usage on Solaris 10 C shell and KornShell without issuing errors when executing genif.sh script.