Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/Zend/CMakeLists.txt

@@ -64,19 +64,6 @@ include(FeatureSummary)
 include(PHP/AddCustomCommand)
 include(PHP/SearchLibraries)
 
-################################################################################
-# Configuration.
-################################################################################
-
-cmake_dependent_option(
-  ZEND_SIGNALS
-  "Enable Zend signal handling"
-  ON
-  [[NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"]]
-  OFF
-)
-mark_as_advanced(ZEND_SIGNALS)
-
 ################################################################################
 # Add library.
 ################################################################################
@@ -460,28 +447,7 @@ include(cmake/Fibers.cmake)
 include(cmake/GenerateGrammar.cmake)
 include(cmake/GlobalRegisterVariables.cmake)
 include(cmake/MaxExecutionTimers.cmake)
-
-################################################################################
-# Zend signals.
-################################################################################
-
-message(CHECK_START "Checking whether to enable Zend signal handling")
-check_symbol_exists(sigaction signal.h HAVE_SIGACTION)
-if(HAVE_SIGACTION AND ZEND_SIGNALS)
-  message(CHECK_PASS "yes")
-
-  # zend_config.h (or its parent php_config.h) isn't included in some zend_*
-  # files, therefore also compilation definition is added.
-  target_compile_definitions(zend PUBLIC ZEND_SIGNALS)
-else()
-  set(ZEND_SIGNALS OFF)
-  message(CHECK_FAIL "no")
-endif()
-add_feature_info(
-  "Zend signals"
-  ZEND_SIGNALS
-  "signal handling for performance"
-)
+include(cmake/Signals.cmake)
 
 ################################################################################
 # Create files and set installation.

cmake/Zend/cmake/Signals.cmake

@@ -0,0 +1,41 @@
+#[=============================================================================[
+Check whether to enable Zend signals.
+#]=============================================================================]
+
+include(CheckSymbolExists)
+include(CMakeDependentOption)
+include(FeatureSummary)
+
+cmake_dependent_option(
+  ZEND_SIGNALS
+  "Enable Zend signal handling"
+  ON
+  [[NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"]]
+  OFF
+)
+mark_as_advanced(ZEND_SIGNALS)
+
+message(CHECK_START "Checking whether to enable Zend signal handling")
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(HAVE_SIGACTION FALSE)
+endif()
+
+check_symbol_exists(sigaction signal.h HAVE_SIGACTION)
+
+if(HAVE_SIGACTION AND ZEND_SIGNALS)
+  message(CHECK_PASS "yes")
+
+  # zend_config.h (or its wrapper php_config.h) isn't included in some zend_*
+  # files, therefore also compilation definition is added.
+  target_compile_definitions(zend PUBLIC ZEND_SIGNALS)
+else()
+  set(ZEND_SIGNALS OFF)
+  message(CHECK_FAIL "no")
+endif()
+
+add_feature_info(
+  "Zend signals"
+  ZEND_SIGNALS
+  "signal handling for performance"
+)

cmake/cmake/platforms/Windows.cmake

@@ -130,7 +130,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_SETITIMER FALSE)
   set(HAVE_SETPROCTITLE FALSE)
   set(HAVE_SHM_CREATE_LARGEPAGE FALSE)
-  set(HAVE_SIGACTION FALSE)
   set(HAVE_SIGPROCMASK FALSE)
   set(HAVE_SIZEOF_GID_T FALSE)
   set(HAVE_SIZEOF_SSIZE_T FALSE)