Skip to content

Commit d5b5e61

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix bug GH-15514 (Configure error: genif.sh: syntax error)
2 parents 9e63e20 + 48a18e5 commit d5b5e61

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

NEWS

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ PHP NEWS
66
. Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer).
77
(zeriyoshi)
88
. Fixed bug GH-15515 (Configure error grep illegal option q). (Peter Kokot)
9+
. Fixed bug GH-15514 (Configure error: genif.sh: syntax error). (Peter Kokot)
910

1011
- MySQLnd:
1112
. Fixed bug GH-15432 (Heap corruption when querying a vector). (cmb,

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -1832,10 +1832,10 @@ FEO
18321832
dnl Run this only when generating all the files.
18331833
if test -n "\$REDO_ALL"; then
18341834
echo "creating main/internal_functions.c"
1835-
AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
1835+
AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
18361836
18371837
echo "creating main/internal_functions_cli.c"
1838-
AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
1838+
AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
18391839
18401840
if test "$PHP_SAPI" = "apache2handler"; then
18411841
if test "$APACHE_VERSION" -ge 2004001; then

0 commit comments

Comments
 (0)