Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/Zend/CMakeLists.txt

@@ -479,24 +479,27 @@ add_feature_info(
 )
 
 # Check Zend max execution timers.
-include(Zend/MaxExecutionTimers)
+include(cmake/MaxExecutionTimers.cmake)
 if(TARGET Zend::MaxExecutionTimers)
   target_link_libraries(zend PRIVATE Zend::MaxExecutionTimers)
 endif()
 
 # Check MM alignment.
-include(Zend/CheckMMAlignment)
+include(cmake/CheckMMAlignment.cmake)
 
 # Check for global register variables.
 if(ZEND_GLOBAL_REGISTER_VARIABLES)
-  include(Zend/CheckGlobalRegisterVariables)
+  include(cmake/CheckGlobalRegisterVariables.cmake)
 endif()
 
 # Check if stack grows downward.
-include(Zend/CheckStackLimit)
+include(cmake/CheckStackLimit.cmake)
 
 # Check float precision.
-include(Zend/CheckFloatPrecision)
+include(cmake/CheckFloatPrecision.cmake)
+
+# Check for strerror_r, and if its a POSIX-compatible or a GNU-specific version.
+include(cmake/CheckStrerrorR.cmake)
 
 ################################################################################
 # Generate lexers and parsers.
@@ -606,7 +609,7 @@ endif()
 # Configure fibers.
 ################################################################################
 
-include(Zend/Fibers)
+include(cmake/Fibers.cmake)
 if(TARGET Zend::Fibers)
   target_link_libraries(zend PRIVATE Zend::Fibers)
 endif()

cmake/cmake/modules/Zend/CheckFloatPrecision.cmake renamed to cmake/Zend/cmake/CheckFloatPrecision.cmake

@@ -59,6 +59,12 @@
 /* Define to 1 if you have the 'sigaction' function. */
 #cmakedefine HAVE_SIGACTION 1
 
+/* Define if you have 'strerror_r'. */
+#cmakedefine HAVE_STRERROR_R 1
+
+/* Define to 1 if strerror_r returns char *. */
+#cmakedefine STRERROR_R_CHAR_P 1
+
 /* Define to 1 if checking the stack limit is supported. */
 #cmakedefine ZEND_CHECK_STACK_LIMIT 1
 

cmake/cmake/modules/Zend/CheckGlobalRegisterVariables.cmake renamed to cmake/Zend/cmake/CheckGlobalRegisterVariables.cmake

@@ -416,9 +416,6 @@ else()
   message(CHECK_FAIL "no")
 endif()
 
-# Check for strerror_r, and if its a POSIX-compatible or a GNU-specific version.
-include(PHP/CheckStrerrorR)
-
 # Check getaddrinfo().
 include(PHP/CheckGetaddrinfo)
 if(TARGET PHP::CheckGetaddrinfoLibrary)
@@ -469,6 +466,9 @@ if(PHP_IPV6)
   include(PHP/CheckIPv6)
 endif()
 
+# Check how flush should be called.
+include(PHP/CheckFlushIo)
+
 # Check for aarch64 CRC32 API.
 message(CHECK_START "Checking for aarch64 CRC32 API availability")
 cmake_push_check_state(RESET)