Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/checks/CheckFopencookie.cmake

@@ -1,22 +1,20 @@
 #[=============================================================================[
-Check if 'fopencookie()' works as expected.
+Check if fopencookie() works as expected.
 
-Module first checks if 'fopencookie()' and type 'cookie_io_functions_t' are
-available. Then it checks whether the 'fopencookie' seeker uses type 'off64_t'.
-Since 'off64_t' is non-standard and obsolescent, the standard 'off_t' type can
-be used on both 64-bit and 32-bit systems, where the '_FILE_OFFSET_BITS=64' can
-make it behave like 'off64_t' on 32-bit. Since code is in the transition process
-to use 'off_t' only, check is left here when using glibc.
+First, the fopencookie() and type cookie_io_functions_t are checked if they are
+available. Then check is done whether the 'fopencookie' seeker uses type
+off64_t. Since off64_t is non-standard and obsolescent, the standard off_t type
+can be used on both 64-bit and 32-bit systems, where the _FILE_OFFSET_BITS=64
+can make it behave like off64_t on 32-bit platforms. Since code is in the
+transition process to use off_t only, check is left here when using glibc.
 
 Result variables:
 
-* HAVE_FOPENCOOKIE - Whether 'fopencookie()' and 'cookie_io_functions_t' are
-  available.
-* COOKIE_SEEKER_USES_OFF64_T - Whether 'fopencookie' seeker uses the 'off64_t'
-  type.
+* HAVE_FOPENCOOKIE
+* COOKIE_SEEKER_USES_OFF64_T
 #]=============================================================================]
 
-include(CheckSourceRuns)
+include(CheckSourceCompiles)
 include(CheckSymbolExists)
 include(CheckTypeSize)
 include(CMakePushCheckState)
@@ -51,29 +49,17 @@ set(HAVE_FOPENCOOKIE TRUE)
 
 # Skip in consecutive configuration phases.
 if(DEFINED PHP_HAS_COOKIE_SEEKER_OFF64_T)
-  if(PHP_HAS_COOKIE_SEEKER_OFF64_T)
-    set(COOKIE_SEEKER_USES_OFF64_T TRUE)
-  endif()
+  set(COOKIE_SEEKER_USES_OFF64_T ${PHP_HAS_COOKIE_SEEKER_OFF64_T})
   return()
 endif()
 
 # GNU C library can have a different seeker definition using off64_t.
 message(CHECK_START "Checking whether fopencookie seeker uses off64_t")
 
-if(
-  NOT DEFINED PHP_HAS_COOKIE_SEEKER_OFF64_T_EXITCODE
-  AND CMAKE_CROSSCOMPILING
-  AND NOT CMAKE_CROSSCOMPILING_EMULATOR
-  AND CMAKE_SYSTEM_NAME STREQUAL "Linux"
-  AND PHP_C_STANDARD_LIBRARY STREQUAL "glibc"
-)
-  set(PHP_HAS_COOKIE_SEEKER_OFF64_T_EXITCODE 0)
-endif()
-
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
 
-  check_source_runs(C [[
+  check_source_compiles(C [[
     #include <stdio.h>
     #include <stdlib.h>
 
@@ -125,8 +111,9 @@ cmake_push_check_state(RESET)
 cmake_pop_check_state()
 
 if(PHP_HAS_COOKIE_SEEKER_OFF64_T)
-  set(COOKIE_SEEKER_USES_OFF64_T TRUE)
   message(CHECK_PASS "yes")
 else()
   message(CHECK_FAIL "no")
 endif()
+
+set(COOKIE_SEEKER_USES_OFF64_T ${PHP_HAS_COOKIE_SEEKER_OFF64_T})

cmake/cmake/toolchains/template.cmake

@@ -16,9 +16,6 @@ set(CMAKE_FIND_ROOT_PATH "")
 # PHP
 ################################################################################
 
-# Set the exit code for the fopencookie seeker using off64_t check.
-set(PHP_HAS_COOKIE_SEEKER_OFF64_T_EXITCODE 0)
-
 # Set the exit code if flush should be called explicitly after a buffered io.
 set(PHP_HAS_FLUSHIO_EXITCODE 1)
 

cmake/main/cmake/php_config.h.in

@@ -124,7 +124,8 @@
 /* Define to 1 if the system has a working POSIX 'fnmatch' function. */
 #cmakedefine HAVE_FNMATCH 1
 
-/* Define to 1 if you have the 'fopencookie' function. */
+/* Define to 1 if the system has the 'fopencookie' function and the
+   'cookie_io_functions_t' type. */
 #cmakedefine HAVE_FOPENCOOKIE 1
 
 /* Define to 1 if you have the 'ftok' function. */