Merge branch 'PHP-8.4'

petk · petk · commit b6c105295c58 · 2025-09-01T00:08:38.000+02:00
diff --git a/cmake/cmake/ConfigureChecks.cmake b/cmake/cmake/ConfigureChecks.cmake
@@ -56,7 +56,10 @@ check_include_files(dirent.h HAVE_DIRENT_H)
 check_include_files(dlfcn.h HAVE_DLFCN_H)
 check_include_files(dns.h HAVE_DNS_H)
 check_include_files(fcntl.h HAVE_FCNTL_H)
-check_include_files(grp.h HAVE_GRP_H)
+
+check_include_files(grp.h PHP_HAVE_GRP_H)
+set(HAVE_GRP_H ${PHP_HAVE_GRP_H})
+
 check_include_files(ieeefp.h HAVE_IEEEFP_H)
 check_include_files(langinfo.h HAVE_LANGINFO_H)
 check_include_files(linux/sock_diag.h HAVE_LINUX_SOCK_DIAG_H)
@@ -97,7 +100,10 @@ check_include_files(sys/vfs.h HAVE_SYS_VFS_H)
 check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
 check_include_files(sysexits.h HAVE_SYSEXITS_H)
 check_include_files(syslog.h HAVE_SYSLOG_H)
-check_include_files(unistd.h HAVE_UNISTD_H)
+
+check_include_files(unistd.h PHP_HAVE_UNISTD_H)
+set(HAVE_UNISTD_H ${PHP_HAVE_UNISTD_H})
+
 # QNX requires unix.h to allow functions in libunix to work properly.
 check_include_files(unix.h HAVE_UNIX_H)
 check_include_files(utime.h HAVE_UTIME_H)
diff --git a/cmake/cmake/checks/CheckFlushIo.cmake b/cmake/cmake/checks/CheckFlushIo.cmake
@@ -29,9 +29,9 @@ message(
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
 
-  check_include_files(unistd.h HAVE_UNISTD_H)
+  check_include_files(unistd.h PHP_HAVE_UNISTD_H)
 
-  if(HAVE_UNISTD_H)
+  if(PHP_HAVE_UNISTD_H)
     set(CMAKE_REQUIRED_DEFINITIONS -DHAVE_UNISTD_H)
   endif()
 
diff --git a/cmake/cmake/checks/CheckWrite.cmake b/cmake/cmake/checks/CheckWrite.cmake
@@ -36,9 +36,9 @@ endif()
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
 
-  check_include_files(unistd.h HAVE_UNISTD_H)
+  check_include_files(unistd.h PHP_HAVE_UNISTD_H)
 
-  if(HAVE_UNISTD_H)
+  if(PHP_HAVE_UNISTD_H)
     list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_UNISTD_H)
   endif()
 
diff --git a/cmake/cmake/platforms/Windows.cmake b/cmake/cmake/platforms/Windows.cmake
@@ -77,7 +77,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_GETTID FALSE)
   set(HAVE_GETWD FALSE)
   set(HAVE_GLOB FALSE)
-  set(HAVE_GRP_H FALSE)
   set(HAVE_HSTRERROR FALSE)
   set(HAVE_IEEEFP_H FALSE)
   set(HAVE_IF_INDEXTONAME FALSE)
@@ -181,7 +180,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_SYSEXITS_H FALSE)
   set(HAVE_TMMINTRIN_H TRUE)
   set(HAVE_TZSET TRUE)
-  set(HAVE_UNISTD_H FALSE)
   set(HAVE_UNIX_H FALSE)
   set(HAVE_UNSETENV FALSE)
   set(HAVE_UTIME TRUE)
@@ -263,6 +261,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_HAS_WNO_UNUSED_PARAMETER_C FALSE)
   set(PHP_HAS_WNO_UNUSED_PARAMETER_CXX FALSE)
   set(PHP_HAS_WSTRICT_PROTOTYPES_C FALSE)
+  set(PHP_HAVE_GRP_H FALSE)
+  set(PHP_HAVE_UNISTD_H FALSE)
   set(PHP_SAPI_CLI_HAVE_PS_STRINGS FALSE)
   set(PHP_SAPI_PHPDBG_HAS_UFFDIO_WRITEPROTECT_MODE_WP FALSE)
   set(PHP_ZEND_HAS_PGRAB FALSE)
diff --git a/cmake/ext/posix/CMakeLists.txt b/cmake/ext/posix/CMakeLists.txt
@@ -76,49 +76,78 @@ target_sources(
 
 target_compile_definitions(php_ext_posix PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 
-check_symbol_exists(ctermid stdio.h HAVE_CTERMID)
+check_symbol_exists(ctermid stdio.h PHP_EXT_POSIX_HAVE_CTERMID)
+set(HAVE_CTERMID ${PHP_EXT_POSIX_HAVE_CTERMID})
+
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(eaccess unistd.h HAVE_EACCESS)
+  check_symbol_exists(eaccess unistd.h PHP_EXT_POSIX_HAVE_EACCESS)
+  set(HAVE_EACCESS ${PHP_EXT_POSIX_HAVE_EACCESS})
 cmake_pop_check_state()
-check_symbol_exists(getgrgid_r grp.h HAVE_GETGRGID_R)
-check_symbol_exists(getgroups unistd.h HAVE_GETGROUPS)
-check_symbol_exists(getlogin unistd.h HAVE_GETLOGIN)
-check_symbol_exists(getpgid unistd.h HAVE_GETPGID)
-check_symbol_exists(getrlimit sys/resource.h HAVE_GETRLIMIT)
-check_symbol_exists(getsid unistd.h HAVE_GETSID)
+
+check_symbol_exists(getgrgid_r grp.h PHP_EXT_POSIX_HAVE_GETGRGID_R)
+set(HAVE_GETGRGID_R ${PHP_EXT_POSIX_HAVE_GETGRGID_R})
+
+check_symbol_exists(getgroups unistd.h PHP_EXT_POSIX_HAVE_GETGROUPS)
+set(HAVE_GETGROUPS ${PHP_EXT_POSIX_HAVE_GETGROUPS})
+
+check_symbol_exists(getlogin unistd.h PHP_EXT_POSIX_HAVE_GETLOGIN)
+set(HAVE_GETLOGIN ${PHP_EXT_POSIX_HAVE_GETLOGIN})
+
+check_symbol_exists(getpgid unistd.h PHP_EXT_POSIX_HAVE_GETPGID)
+set(HAVE_GETPGID ${PHP_EXT_POSIX_HAVE_GETPGID})
+
+check_symbol_exists(getrlimit sys/resource.h PHP_EXT_POSIX_HAVE_GETRLIMIT)
+set(HAVE_GETRLIMIT ${PHP_EXT_POSIX_HAVE_GETRLIMIT})
+
+check_symbol_exists(getsid unistd.h PHP_EXT_POSIX_HAVE_GETSID)
+set(HAVE_GETSID ${PHP_EXT_POSIX_HAVE_GETSID})
 
 # BSD-based systems have initgroups in unistd.h, elsewhere it is in grp.h.
 block()
   set(headers "")
 
-  check_include_files(grp.h HAVE_GRP_H)
-  if(HAVE_GRP_H)
+  check_include_files(grp.h PHP_HAVE_GRP_H)
+  if(PHP_HAVE_GRP_H)
     list(APPEND headers "grp.h")
   endif()
 
-  check_include_files(unistd.h HAVE_UNISTD_H)
-  if(HAVE_UNISTD_H)
+  check_include_files(unistd.h PHP_HAVE_UNISTD_H)
+  if(PHP_HAVE_UNISTD_H)
     list(APPEND headers "unistd.h")
   endif()
 
-  check_symbol_exists(initgroups "${headers}" HAVE_INITGROUPS)
+  check_symbol_exists(initgroups "${headers}" PHP_EXT_POSIX_HAVE_INITGROUPS)
+  set(HAVE_INITGROUPS ${PHP_EXT_POSIX_HAVE_INITGROUPS})
 endblock()
 
-check_symbol_exists(mkfifo sys/stat.h HAVE_MKFIFO)
-check_symbol_exists(mknod sys/stat.h HAVE_MKNOD)
+check_symbol_exists(mkfifo sys/stat.h PHP_EXT_POSIX_HAVE_MKFIFO)
+set(HAVE_MKFIFO ${PHP_EXT_POSIX_HAVE_MKFIFO})
+
+check_symbol_exists(mknod sys/stat.h PHP_EXT_POSIX_HAVE_MKNOD)
+set(HAVE_MKNOD ${PHP_EXT_POSIX_HAVE_MKNOD})
 
 # Skip pathconf and fpathconf check on musl libc due to limited implementation
 # (first argument is not validated and has different error).
 if(NOT PHP_C_STANDARD_LIBRARY STREQUAL "musl")
-  check_symbol_exists(pathconf unistd.h HAVE_PATHCONF)
-  check_symbol_exists(fpathconf unistd.h HAVE_FPATHCONF)
+  check_symbol_exists(pathconf unistd.h PHP_EXT_POSIX_HAVE_PATHCONF)
+  set(HAVE_PATHCONF ${PHP_EXT_POSIX_HAVE_PATHCONF})
+
+  check_symbol_exists(fpathconf unistd.h PHP_EXT_POSIX_HAVE_FPATHCONF)
+  set(HAVE_FPATHCONF ${PHP_EXT_POSIX_HAVE_FPATHCONF})
 endif()
 
-check_symbol_exists(setegid unistd.h HAVE_SETEGID)
-check_symbol_exists(seteuid unistd.h HAVE_SETEUID)
-check_symbol_exists(setrlimit sys/resource.h HAVE_SETRLIMIT)
-check_symbol_exists(setsid unistd.h HAVE_SETSID)
+check_symbol_exists(setegid unistd.h PHP_EXT_POSIX_HAVE_SETEGID)
+set(HAVE_SETEGID ${PHP_EXT_POSIX_HAVE_SETEGID})
+
+check_symbol_exists(seteuid unistd.h PHP_EXT_POSIX_HAVE_SETEUID)
+set(HAVE_SETEUID ${PHP_EXT_POSIX_HAVE_SETEUID})
+
+check_symbol_exists(setrlimit sys/resource.h PHP_EXT_POSIX_HAVE_SETRLIMIT)
+set(HAVE_SETRLIMIT ${PHP_EXT_POSIX_HAVE_SETRLIMIT})
+
+check_symbol_exists(setsid unistd.h PHP_EXT_POSIX_HAVE_SETSID)
+set(HAVE_SETSID ${PHP_EXT_POSIX_HAVE_SETSID})
 
 # Check for major, minor, and makedev.
 include(PHP/CheckSysMacros)
@@ -131,7 +160,11 @@ cmake_push_check_state(RESET)
     "struct utsname"
     domainname
     sys/utsname.h
+    PHP_EXT_POSIX_HAVE_STRUCT_UTSNAME_DOMAINNAME
+  )
+  set(
     HAVE_STRUCT_UTSNAME_DOMAINNAME
+    ${PHP_EXT_POSIX_HAVE_STRUCT_UTSNAME_DOMAINNAME}
   )
 cmake_pop_check_state()
 
diff --git a/cmake/ext/standard/cmake/CheckCrypt.cmake b/cmake/ext/standard/cmake/CheckCrypt.cmake
@@ -26,10 +26,10 @@ function(_php_ext_standard_check_crypt)
     set(CMAKE_REQUIRED_LIBRARIES Crypt::Crypt)
     set(CMAKE_REQUIRED_QUIET TRUE)
 
-    check_include_files(unistd.h HAVE_UNISTD_H)
+    check_include_files(unistd.h PHP_HAVE_UNISTD_H)
     check_include_files(crypt.h HAVE_CRYPT_H)
 
-    if(HAVE_UNISTD_H)
+    if(PHP_HAVE_UNISTD_H)
       list(APPEND headers "unistd.h")
     endif()
     if(HAVE_CRYPT_H)
@@ -171,7 +171,7 @@ function(_php_ext_standard_check_crypt_is_usable)
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_QUIET TRUE)
 
-    if(HAVE_UNISTD_H)
+    if(PHP_HAVE_UNISTD_H)
       list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_UNISTD_H)
     endif()
 
diff --git a/cmake/main/cmake/php_config.h.in b/cmake/main/cmake/php_config.h.in
@@ -188,9 +188,6 @@
 /* Define to 1 if you have the 'getpwuid_r' function. */
 #cmakedefine HAVE_GETPWUID_R 1
 
-/* Define to 1 if you have the 'getrlimit' function. */
-#cmakedefine HAVE_GETRLIMIT 1
-
 /* Define to 1 if you have the 'getrusage' function. */
 #cmakedefine HAVE_GETRUSAGE 1
 
@@ -200,9 +197,6 @@
 /* Define to 1 if you have the 'getservbyport' function. */
 #cmakedefine HAVE_GETSERVBYPORT 1
 
-/* Define to 1 if you have the 'getsid' function. */
-#cmakedefine HAVE_GETSID 1
-
 /* Define to 1 if you have the 'gettimeofday' function. */
 #cmakedefine HAVE_GETTIMEOFDAY 1
 
