php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3'

Browse Source 
* 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.
This commit is contained in:
Peter Kokot
2024-08-21 18:20:42 +02:00
parent c69d29ebc3 d5b5e61d80
commit 602a4ac735
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@@ -1796,6 +1796,18 @@ AC_CONFIG_FILES([
AC_CONFIG_COMMANDS_PRE([PHP_PATCH_CONFIG_HEADERS([main/php_config.h.in])])
AC_CONFIG_COMMANDS([main/internal_functions.c], [], [
AWK="$AWK" $SHELL $srcdir/build/genif.sh \
$srcdir/main/internal_functions.c.in \
"$EXT_STATIC" > main/internal_functions.c
])
AC_CONFIG_COMMANDS([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_CONFIG_COMMANDS([default],[
cat <<X
@@ -1817,11 +1829,5 @@ dnl ----------------------------------------------------------------------------
cat >Zend/zend_config.h <<FEO
#include <../main/php_config.h>
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
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
])
AC_OUTPUT