Merge branch 'PHP-8.4'

Author: petk

cmake/Zend/cmake/Signals.cmake

@@ -13,9 +13,10 @@ endif()
 
 message(CHECK_START "Checking whether to enable Zend signal handling")
 
-check_symbol_exists(sigaction signal.h HAVE_SIGACTION)
+check_symbol_exists(sigaction signal.h PHP_HAVE_SIGACTION)
+set(HAVE_SIGACTION ${PHP_HAVE_SIGACTION})
 
-if(HAVE_SIGACTION AND PHP_ZEND_SIGNALS)
+if(PHP_HAVE_SIGACTION AND PHP_ZEND_SIGNALS)
   message(CHECK_PASS "yes")
   set(ZEND_SIGNALS TRUE)
 

cmake/cmake/platforms/Windows.cmake

@@ -68,7 +68,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_FCNTL_H TRUE)
   set(HAVE_FDATASYNC FALSE)
   set(HAVE_FLOCK FALSE)
-  set(HAVE_FORK FALSE)
   set(HAVE_FUNOPEN FALSE)
   set(HAVE_GETGRNAM_R FALSE)
   set(HAVE_GETLOADAVG FALSE)
@@ -197,7 +196,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_EXT_RANDOM_HAVE_COMMONCRYPTO_COMMONRANDOM_H FALSE)
   set(PHP_EXT_RANDOM_HAVE_ARC4RANDOM_BUF FALSE)
   set(PHP_EXT_RANDOM_HAVE_GETRANDOM FALSE)
-  set(PHP_HAS_CREATEPROCESS TRUE)
   set(PHP_HAS_DN_EXPAND FALSE)
   set(PHP_HAS_DN_SKIPNAME FALSE)
   set(PHP_HAS_DNS_SEARCH FALSE)
@@ -261,6 +259,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_CREATEPROCESS TRUE)
+  set(PHP_HAVE_FORK FALSE)
   set(PHP_HAVE_GRP_H FALSE)
   set(PHP_HAVE_UNISTD_H FALSE)
   set(PHP_SAPI_CLI_HAVE_PS_STRINGS FALSE)

cmake/cmake/toolchains/template.cmake

@@ -103,7 +103,7 @@ set(PHP_EXT_OPCACHE_HAS_SHM_MMAP_POSIX_EXITCODE 0)
 ################################################################################
 
 # Set the exit code of the sched_getcpu() check.
-set(PHP_EXT_PCNTL_HAS_SCHED_GETCPU_EXITCODE 0)
+set(PHP_EXT_PCNTL_HAVE_SCHED_GETCPU_EXITCODE 0)
 
 ################################################################################
 # ext/pcre

cmake/ext/pcntl/CMakeLists.txt

@@ -87,9 +87,9 @@ target_compile_definitions(php_ext_pcntl PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE
 
 # Check for required functions.
 block()
-  check_symbol_exists(fork unistd.h HAVE_FORK)
-  check_symbol_exists(sigaction signal.h HAVE_SIGACTION)
-  check_symbol_exists(waitpid sys/wait.h HAVE_WAITPID)
+  check_symbol_exists(fork unistd.h PHP_HAVE_FORK)
+  check_symbol_exists(sigaction signal.h PHP_HAVE_SIGACTION)
+  check_symbol_exists(waitpid sys/wait.h PHP_HAVE_WAITPID)
 
   foreach(function fork sigaction waitpid)
     string(TOUPPER ${function} const)
@@ -102,42 +102,98 @@ block()
   endforeach()
 endblock()
 
-check_symbol_exists(forkx sys/fork.h HAVE_FORKX)
-check_symbol_exists(getcpuid sys/processor.h HAVE_GETCPUID)
-check_symbol_exists(getpriority sys/resource.h HAVE_GETPRIORITY)
-check_symbol_exists(pset_bind sys/pset.h HAVE_PSET_BIND)
+check_symbol_exists(forkx sys/fork.h PHP_EXT_PCNTL_HAVE_FORKX)
+set(HAVE_FORKX ${PHP_EXT_PCNTL_HAVE_FORKX})
+
+check_symbol_exists(getcpuid sys/processor.h PHP_EXT_PCNTL_HAVE_GETCPUID)
+set(HAVE_GETCPUID ${PHP_EXT_PCNTL_HAVE_GETCPUID})
+
+check_symbol_exists(getpriority sys/resource.h PHP_EXT_PCNTL_HAVE_GETPRIORITY)
+set(HAVE_GETPRIORITY ${PHP_EXT_PCNTL_HAVE_GETPRIORITY})
+
+check_symbol_exists(pset_bind sys/pset.h PHP_EXT_PCNTL_HAVE_PSET_BIND)
+set(HAVE_PSET_BIND ${PHP_EXT_PCNTL_HAVE_PSET_BIND})
+
 check_symbol_exists(
   pthread_set_qos_class_self_np
   pthread/qos.h
+  PHP_EXT_PCNTL_HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP
+)
+set(
   HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP
+  ${PHP_EXT_PCNTL_HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP}
 )
-check_symbol_exists(rfork unistd.h HAVE_RFORK)
+
+check_symbol_exists(rfork unistd.h PHP_EXT_PCNTL_HAVE_RFORK)
+set(HAVE_RFORK ${PHP_EXT_PCNTL_HAVE_RFORK})
+
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(sched_setaffinity sched.h HAVE_SCHED_SETAFFINITY)
+  check_symbol_exists(
+    sched_setaffinity
+    sched.h
+    PHP_EXT_PCNTL_HAVE_SCHED_SETAFFINITY
+  )
+  set(HAVE_SCHED_SETAFFINITY ${PHP_EXT_PCNTL_HAVE_SCHED_SETAFFINITY})
 cmake_pop_check_state()
-check_symbol_exists(setpriority sys/resource.h HAVE_SETPRIORITY)
-check_symbol_exists(sigtimedwait signal.h HAVE_SIGTIMEDWAIT)
-check_symbol_exists(sigwaitinfo signal.h HAVE_SIGWAITINFO)
-check_symbol_exists(SYS_pidfd_open sys/syscall.h HAVE_DECL_SYS_PIDFD_OPEN)
-check_symbol_exists(SYS_waitid sys/syscall.h HAVE_DECL_SYS_WAITID)
+
+check_symbol_exists(setpriority sys/resource.h PHP_EXT_PCNTL_HAVE_SETPRIORITY)
+set(HAVE_SETPRIORITY ${PHP_EXT_PCNTL_HAVE_SETPRIORITY})
+
+check_symbol_exists(sigtimedwait signal.h PHP_EXT_PCNTL_HAVE_SIGTIMEDWAIT)
+set(HAVE_SIGTIMEDWAIT ${PHP_EXT_PCNTL_HAVE_SIGTIMEDWAIT})
+
+check_symbol_exists(sigwaitinfo signal.h PHP_EXT_PCNTL_HAVE_SIGWAITINFO)
+set(HAVE_SIGWAITINFO ${PHP_EXT_PCNTL_HAVE_SIGWAITINFO})
+
+check_symbol_exists(
+  SYS_pidfd_open
+  sys/syscall.h
+  PHP_EXT_PCNTL_HAVE_DECL_SYS_PIDFD_OPEN
+)
+set(HAVE_DECL_SYS_PIDFD_OPEN ${PHP_EXT_PCNTL_HAVE_DECL_SYS_PIDFD_OPEN})
+
+check_symbol_exists(SYS_waitid sys/syscall.h PHP_EXT_PCNTL_HAVE_DECL_SYS_WAITID)
+set(HAVE_DECL_SYS_WAITID ${PHP_EXT_PCNTL_HAVE_DECL_SYS_WAITID})
+
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(syscall "sys/syscall.h;unistd.h" HAVE_SYSCALL)
+  check_symbol_exists(syscall "sys/syscall.h;unistd.h" PHP_EXT_PCNTL_HAVE_SYSCALL)
+  set(HAVE_SYSCALL ${PHP_EXT_PCNTL_HAVE_SYSCALL})
 cmake_pop_check_state()
+
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(unshare sched.h HAVE_UNSHARE)
+  check_symbol_exists(unshare sched.h PHP_EXT_PCNTL_HAVE_UNSHARE)
+  set(HAVE_UNSHARE ${PHP_EXT_PCNTL_HAVE_UNSHARE})
 cmake_pop_check_state()
-check_symbol_exists(wait3 sys/wait.h HAVE_WAIT3)
-check_symbol_exists(wait4 sys/wait.h HAVE_WAIT4)
-check_symbol_exists(wait6 sys/wait.h HAVE_WAIT6)
-check_symbol_exists(waitid sys/wait.h HAVE_WAITID)
-check_symbol_exists(WCONTINUED sys/wait.h HAVE_DECL_WCONTINUED)
-check_symbol_exists(WEXITED sys/wait.h HAVE_DECL_WEXITED)
-check_symbol_exists(WIFCONTINUED sys/wait.h HAVE_WIFCONTINUED)
-check_symbol_exists(WNOWAIT sys/wait.h HAVE_DECL_WNOWAIT)
-check_symbol_exists(WSTOPPED sys/wait.h HAVE_DECL_WSTOPPED)
+
+check_symbol_exists(wait6 sys/wait.h PHP_EXT_PCNTL_HAVE_WAIT6)
+set(HAVE_WAIT6 ${PHP_EXT_PCNTL_HAVE_WAIT6})
+
+check_symbol_exists(wait3 sys/wait.h PHP_EXT_PCNTL_HAVE_WAIT3)
+set(HAVE_WAIT3 ${PHP_EXT_PCNTL_HAVE_WAIT3})
+
+check_symbol_exists(wait4 sys/wait.h PHP_EXT_PCNTL_HAVE_WAIT4)
+set(HAVE_WAIT4 ${PHP_EXT_PCNTL_HAVE_WAIT4})
+
+check_symbol_exists(waitid sys/wait.h PHP_EXT_PCNTL_HAVE_WAITID)
+set(HAVE_WAITID ${PHP_EXT_PCNTL_HAVE_WAITID})
+
+check_symbol_exists(WCONTINUED sys/wait.h PHP_EXT_PCNTL_HAVE_DECL_WCONTINUED)
+set(HAVE_DECL_WCONTINUED ${PHP_EXT_PCNTL_HAVE_DECL_WCONTINUED})
+
+check_symbol_exists(WEXITED sys/wait.h PHP_EXT_PCNTL_HAVE_DECL_WEXITED)
+set(HAVE_DECL_WEXITED ${PHP_EXT_PCNTL_HAVE_DECL_WEXITED})
+
+check_symbol_exists(WIFCONTINUED sys/wait.h PHP_EXT_PCNTL_HAVE_WIFCONTINUED)
+set(HAVE_WIFCONTINUED ${PHP_EXT_PCNTL_HAVE_WIFCONTINUED})
+
+check_symbol_exists(WNOWAIT sys/wait.h PHP_EXT_PCNTL_HAVE_DECL_WNOWAIT)
+set(HAVE_DECL_WNOWAIT ${PHP_EXT_PCNTL_HAVE_DECL_WNOWAIT})
+
+check_symbol_exists(WSTOPPED sys/wait.h PHP_EXT_PCNTL_HAVE_DECL_WSTOPPED)
+set(HAVE_DECL_WSTOPPED ${PHP_EXT_PCNTL_HAVE_DECL_WSTOPPED})
 
 cmake_push_check_state(RESET)
   # Some of these enum values require _GNU_SOURCE.
@@ -146,30 +202,34 @@ cmake_push_check_state(RESET)
   check_source_compiles(C [[
     #include <sys/wait.h>
     int main(void) { idtype_t e = P_ALL; (void)e; return 0; }
-  ]] HAVE_DECL_P_ALL)
+  ]] PHP_EXT_PCNTL_HAVE_DECL_P_ALL)
+  set(HAVE_DECL_P_ALL ${PHP_EXT_PCNTL_HAVE_DECL_P_ALL})
 
   check_source_compiles(C [[
     #include <sys/wait.h>
     int main(void) { idtype_t e = P_JAILID; (void)e; return 0; }
-  ]] HAVE_DECL_P_JAILID)
+  ]] PHP_EXT_PCNTL_HAVE_DECL_P_JAILID)
+  set(HAVE_DECL_P_JAILID ${PHP_EXT_PCNTL_HAVE_DECL_P_JAILID})
 
   check_source_compiles(C [[
     #include <sys/wait.h>
     int main(void) { idtype_t e = P_PIDFD; (void)e; return 0; }
-  ]] HAVE_DECL_P_PIDFD)
+  ]] PHP_EXT_PCNTL_HAVE_DECL_P_PIDFD)
+  set(HAVE_DECL_P_PIDFD ${PHP_EXT_PCNTL_HAVE_DECL_P_PIDFD})
 
   check_source_compiles(C [[
     #include <sys/wait.h>
     int main(void) { idtype_t e = P_UID; (void)e; return 0; }
-  ]] HAVE_DECL_P_UID)
+  ]] PHP_EXT_PCNTL_HAVE_DECL_P_UID)
+  set(HAVE_DECL_P_UID ${PHP_EXT_PCNTL_HAVE_DECL_P_UID})
 cmake_pop_check_state()
 
 cmake_push_check_state(RESET)
   set(CMAKE_EXTRA_INCLUDE_FILES "signal.h")
-  check_type_size(siginfo_t STRUCT_SIGINFO_T)
+  check_type_size(siginfo_t PHP_EXT_PCNTL_STRUCT_SIGINFO_T)
 cmake_pop_check_state()
 
-if(HAVE_STRUCT_SIGINFO_T)
+if(HAVE_PHP_EXT_PCNTL_STRUCT_SIGINFO_T)
   target_compile_definitions(php_ext_pcntl PRIVATE HAVE_STRUCT_SIGINFO_T)
 endif()
 
@@ -183,13 +243,13 @@ cmake_push_check_state(RESET)
       HEADERS sched.h
       LIBRARIES
         gnu # Haiku
-      VARIABLE PHP_EXT_PCNTL_HAS_SCHED_GETCPU_SYMBOL
-      LIBRARY_VARIABLE PHP_EXT_PCNTL_HAS_SCHED_GETCPU_LIBRARY
+      VARIABLE PHP_EXT_PCNTL_HAVE_SCHED_GETCPU_SYMBOL
+      LIBRARY_VARIABLE PHP_EXT_PCNTL_HAVE_SCHED_GETCPU_LIBRARY
     )
 
-    if(PHP_EXT_PCNTL_HAS_SCHED_GETCPU_SYMBOL)
-      if(PHP_EXT_PCNTL_HAS_SCHED_GETCPU_LIBRARY)
-        set(CMAKE_REQUIRED_LIBRARIES ${PHP_EXT_PCNTL_HAS_SCHED_GETCPU_LIBRARY})
+    if(PHP_EXT_PCNTL_HAVE_SCHED_GETCPU_SYMBOL)
+      if(PHP_EXT_PCNTL_HAVE_SCHED_GETCPU_LIBRARY)
+        set(CMAKE_REQUIRED_LIBRARIES ${PHP_EXT_PCNTL_HAVE_SCHED_GETCPU_LIBRARY})
       endif()
       check_source_runs(C [[
         #include <sched.h>
@@ -200,14 +260,14 @@ cmake_push_check_state(RESET)
           }
           return 0;
         }
-      ]] PHP_EXT_PCNTL_HAS_SCHED_GETCPU)
+      ]] PHP_EXT_PCNTL_HAVE_SCHED_GETCPU)
     endif()
 
-    if(PHP_EXT_PCNTL_HAS_SCHED_GETCPU)
-      if(PHP_EXT_PCNTL_HAS_SCHED_GETCPU_LIBRARY)
+    if(PHP_EXT_PCNTL_HAVE_SCHED_GETCPU)
+      if(PHP_EXT_PCNTL_HAVE_SCHED_GETCPU_LIBRARY)
         target_link_libraries(
           php_ext_pcntl
-          PRIVATE ${PHP_EXT_PCNTL_HAS_SCHED_GETCPU_LIBRARY}
+          PRIVATE ${PHP_EXT_PCNTL_HAVE_SCHED_GETCPU_LIBRARY}
         )
       endif()
 

cmake/ext/standard/CMakeLists.txt

@@ -284,11 +284,12 @@ include(cmake/CheckStrptime.cmake)
 # Check if there is a support means of creating a new process and defining which
 # handles it receives.
 message(CHECK_START "Checking if OS can spawn processes with inherited handles")
-check_symbol_exists(fork unistd.h HAVE_FORK)
-if(NOT HAVE_FORK)
-  check_symbol_exists(CreateProcess windows.h PHP_HAS_CREATEPROCESS)
+check_symbol_exists(fork unistd.h PHP_HAVE_FORK)
+set(HAVE_FORK ${PHP_HAVE_FORK})
+if(NOT PHP_HAVE_FORK)
+  check_symbol_exists(CreateProcess windows.h PHP_HAVE_CREATEPROCESS)
 endif()
-if(HAVE_FORK OR PHP_HAS_CREATEPROCESS)
+if(PHP_HAVE_FORK OR PHP_HAVE_CREATEPROCESS)
   set(PHP_CAN_SUPPORT_PROC_OPEN TRUE)
 
   message(CHECK_PASS "yes")