Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/toolchains/template.cmake

@@ -114,8 +114,8 @@ set(PHP_EXT_OPCACHE_HAS_SHM_MMAP_POSIX_EXITCODE 0)
 # ext/pcntl
 ################################################################################
 
-# Set the exit code of the sched_getcpu check.
-set(HAVE_SCHED_GETCPU_EXITCODE 0)
+# Set the exit code of the sched_getcpu() check.
+set(PHP_EXT_PCNTL_HAS_SCHED_GETCPU_EXITCODE 0)
 
 ################################################################################
 # ext/pcre

cmake/ext/pcntl/CMakeLists.txt

@@ -177,17 +177,17 @@ cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
 
   # Check if sched_getcpu() is supported. Value -1 means ENOSYS in this context.
-  block()
+  block(PROPAGATE HAVE_SCHED_GETCPU)
     php_search_libraries(
       sched_getcpu
       HEADERS sched.h
       LIBRARIES
         gnu # Haiku
-      VARIABLE PHP_EXT_PCNTL_HAS_SCHED_GETCPU
+      VARIABLE PHP_EXT_PCNTL_HAS_SCHED_GETCPU_SYMBOL
       LIBRARY_VARIABLE library
     )
 
-    if(PHP_EXT_PCNTL_HAS_SCHED_GETCPU)
+    if(PHP_EXT_PCNTL_HAS_SCHED_GETCPU_SYMBOL)
       if(library)
         set(CMAKE_REQUIRED_LIBRARIES ${library})
       endif()
@@ -200,11 +200,15 @@ cmake_push_check_state(RESET)
           }
           return 0;
         }
-      ]] HAVE_SCHED_GETCPU)
+      ]] PHP_EXT_PCNTL_HAS_SCHED_GETCPU)
     endif()
 
-    if(HAVE_SCHED_GETCPU AND library)
-      target_link_libraries(php_ext_pcntl PRIVATE ${library})
+    if(PHP_EXT_PCNTL_HAS_SCHED_GETCPU)
+      if(library)
+        target_link_libraries(php_ext_pcntl PRIVATE ${library})
+      endif()
+
+      set(HAVE_SCHED_GETCPU TRUE)
     endif()
   endblock()
 cmake_pop_check_state()