archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  Fix GH-15515: Configure error grep illegal option q (#15516)
This commit is contained in:
Peter Kokot 2024-08-21 15:54:56 +02:00
commit 9e63e20a2c
No known key found for this signature in database
GPG key ID: A94800907AA79B36
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -5,6 +5,7 @@ PHP NEWS
- Core:
. Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer).
(zeriyoshi)
. Fixed bug GH-15515 (Configure error grep illegal option q). (Peter Kokot)
- MySQLnd:
. Fixed bug GH-15432 (Heap corruption when querying a vector). (cmb,

2
configure.ac
View file

@ -264,7 +264,7 @@ esac
dnl Detect musl libc
AC_MSG_CHECKING([whether we are using musl libc])
if command -v ldd >/dev/null && ldd --version 2>&1 | grep -q ^musl
if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1
then
AC_MSG_RESULT(yes)
AC_DEFINE([__MUSL__], [1], [Define when using musl libc])

3
ext/posix/config.m4
View file

@ -14,7 +14,8 @@ if test "$PHP_POSIX" = "yes"; then
dnl Skip pathconf and fpathconf check on musl libc due to limited implementation
dnl (first argument is not validated and has different error).
AS_IF([command -v ldd >/dev/null && ldd --version 2>&1 | grep -q "^musl"],[],
AS_IF([command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1],
[],
[AC_CHECK_FUNCS(pathconf fpathconf)])
AC_MSG_CHECKING([for working ttyname_r() implementation])