Merge branch 'PHP-8.5'

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -240,7 +240,12 @@ set(HAVE_STRUCT_STAT_ST_RDEV ${PHP_HAVE_STRUCT_STAT_ST_RDEV})
 
 cmake_push_check_state(RESET)
   set(CMAKE_EXTRA_INCLUDE_FILES "fcntl.h")
-  check_type_size("struct flock" STRUCT_FLOCK) # Defines HAVE_STRUCT_FLOCK
+  check_type_size(
+    "struct flock"
+    PHP_SIZEOF_STRUCT_FLOCK
+    RESULT_VARIABLE PHP_HAVE_STRUCT_FLOCK
+  )
+  set(HAVE_STRUCT_FLOCK ${PHP_HAVE_STRUCT_FLOCK})
 cmake_pop_check_state()
 
 # Check for sockaddr_storage and sockaddr.sa_len.
@@ -252,8 +257,12 @@ cmake_push_check_state(RESET)
     list(APPEND CMAKE_EXTRA_INCLUDE_FILES "winsock2.h")
   endif()
 
-  check_type_size("struct sockaddr_storage" PHP_STRUCT_SOCKADDR_STORAGE)
-  set(HAVE_STRUCT_SOCKADDR_STORAGE ${HAVE_PHP_STRUCT_SOCKADDR_STORAGE})
+  check_type_size(
+    "struct sockaddr_storage"
+    PHP_SIZEOF_STRUCT_SOCKADDR_STORAGE
+    RESULT_VARIABLE PHP_HAVE_STRUCT_SOCKADDR_STORAGE
+  )
+  set(HAVE_STRUCT_SOCKADDR_STORAGE ${PHP_HAVE_STRUCT_SOCKADDR_STORAGE})
 
   check_struct_has_member(
     "struct sockaddr"
@@ -268,40 +277,40 @@ cmake_pop_check_state()
 # Check types.
 ################################################################################
 
-check_type_size("gid_t" SIZEOF_GID_T)
-if(NOT HAVE_SIZEOF_GID_T)
+check_type_size("gid_t" PHP_SIZEOF_GID_T RESULT_VARIABLE PHP_HAVE_GID_T)
+if(NOT PHP_HAVE_GID_T)
   set(PHP_GID_T_CODE "#define gid_t int")
 else()
   set(PHP_GID_T_CODE "/* #undef gid_t */")
 endif()
 
-check_type_size("int" SIZEOF_INT)
+check_type_size("int" SIZEOF_INT RESULT_VARIABLE PHP_HAVE_INT)
 if(SIZEOF_INT STREQUAL "")
   set(SIZEOF_INT_CODE "#define SIZEOF_INT 0")
 endif()
 
-check_type_size("long" SIZEOF_LONG)
-if(SIZEOF_LONG STREQUAL "")
+check_type_size("long" SIZEOF_LONG RESULT_VARIABLE PHP_HAVE_LONG)
+if(NOT PHP_HAVE_LONG)
   set(SIZEOF_LONG_CODE "#define SIZEOF_LONG 0")
 endif()
 
-check_type_size("long long" SIZEOF_LONG_LONG)
-if(SIZEOF_LONG_LONG STREQUAL "")
+check_type_size("long long" SIZEOF_LONG_LONG RESULT_VARIABLE PHP_HAVE_LONG_LONG)
+if(NOT PHP_HAVE_LONG_LONG)
   set(SIZEOF_LONG_LONG_CODE "#define SIZEOF_LONG_LONG 0")
 endif()
 
-check_type_size("off_t" SIZEOF_OFF_T)
-if(SIZEOF_OFF_T STREQUAL "")
+check_type_size("off_t" SIZEOF_OFF_T RESULT_VARIABLE PHP_HAVE_OFF_T)
+if(NOT PHP_HAVE_OFF_T)
   set(SIZEOF_OFF_T_CODE "#define SIZEOF_OFF_T 0")
 endif()
 
-check_type_size("size_t" SIZEOF_SIZE_T)
-if(SIZEOF_SIZE_T STREQUAL "")
+check_type_size("size_t" SIZEOF_SIZE_T RESULT_VARIABLE PHP_HAVE_SIZE_T)
+if(NOT PHP_HAVE_SIZE_T)
   set(SIZEOF_SIZE_T_CODE "#define SIZEOF_SIZE_T 0")
 endif()
 
-check_type_size("uid_t" SIZEOF_UID_T)
-if(NOT HAVE_SIZEOF_UID_T)
+check_type_size("uid_t" PHP_SIZEOF_UID_T RESULT_VARIABLE PHP_HAVE_UID_T)
+if(NOT PHP_HAVE_UID_T)
   set(PHP_UID_T_CODE "#define uid_t int")
 else()
   set(PHP_UID_T_CODE "/* #undef uid_t */")
@@ -315,7 +324,12 @@ cmake_push_check_state(RESET)
   if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     list(APPEND CMAKE_EXTRA_INCLUDE_FILES ws2tcpip.h)
   endif()
-  check_type_size("socklen_t" SOCKLEN_T) # Defines HAVE_SOCKLEN_T
+  check_type_size(
+    "socklen_t"
+    PHP_SIZEOF_SOCKLEN_T
+    RESULT_VARIABLE PHP_HAVE_SOCKLEN_T
+  )
+  set(HAVE_SOCKLEN_T ${PHP_HAVE_SOCKLEN_T})
 cmake_pop_check_state()
 
 ################################################################################

cmake/cmake/checks/CheckFopencookie.cmake

@@ -38,10 +38,14 @@ endif()
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
   set(CMAKE_EXTRA_INCLUDE_FILES "stdio.h")
-  check_type_size("cookie_io_functions_t" PHP_COOKIE_IO_FUNCTIONS_T)
+  check_type_size(
+    "cookie_io_functions_t"
+    PHP_SIZEOF_COOKIE_IO_FUNCTIONS_T
+    RESULT_VARIABLE PHP_HAVE_COOKIE_IO_FUNCTIONS_T
+  )
 cmake_pop_check_state()
 
-if(NOT HAVE_PHP_COOKIE_IO_FUNCTIONS_T)
+if(NOT PHP_HAVE_COOKIE_IO_FUNCTIONS_T)
   return()
 endif()
 

cmake/cmake/platforms/Windows.cmake

@@ -50,16 +50,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   # much longer compared to POSIX-based environments, the following are always
   # known on Windows targets.
   ##############################################################################
-
-  set(HAVE_PHP_EXT_SOCKETS_STRUCT_CMSGCRED FALSE)
-  set(HAVE_PHP_EXT_SOCKETS_STRUCT_UCRED FALSE)
-  set(HAVE_PHP_STRUCT_SOCKADDR_STORAGE FALSE)
-  set(HAVE_SIZEOF_GID_T FALSE)
-  set(HAVE_SIZEOF_UID_T FALSE)
-  set(HAVE_SOCKLEN_T TRUE)
   set(HAVE_STDDEF_H TRUE) # Defined by check_type_size().
   set(HAVE_STDINT_H TRUE) # Defined by check_type_size().
-  set(HAVE_STRUCT_FLOCK FALSE)
   set(HAVE_SYS_TYPES_H TRUE) # Defined by check_type_size().
   set(PHP_EBCDIC FALSE)
   set(PHP_EXT_DATE_HAS_FWRAP FALSE)
@@ -82,7 +74,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_EXT_SOCKETS_HAVE_LINUX_IF_PACKET_H FALSE)
   set(PHP_EXT_SOCKETS_HAVE_LINUX_UDP_H FALSE)
   set(PHP_EXT_SOCKETS_HAVE_SOCKATMARK FALSE)
+  set(PHP_EXT_SOCKETS_HAVE_STRUCT_CMSGCRED FALSE)
   set(PHP_EXT_SOCKETS_HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY FALSE)
+  set(PHP_EXT_SOCKETS_HAVE_STRUCT_UCRED FALSE)
   set(PHP_EXT_SOCKETS_HAVE_SYS_SOCKIO_H FALSE)
   set(PHP_HAS_ELF FALSE)
   set(PHP_HAS_FFP_CONTRACT_OFF_C FALSE)
@@ -153,6 +147,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_HAVE_GETSERVBYPORT TRUE)
   set(PHP_HAVE_GETSERVBYPORT_LIBRARY ws2_32)
   set(PHP_HAVE_GETWD FALSE)
+  set(PHP_HAVE_GID_T FALSE)
   set(PHP_HAVE_GLOB FALSE)
   set(PHP_HAVE_GRP_H FALSE)
   set(PHP_HAVE_IEEEFP_H FALSE)
@@ -200,13 +195,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_HAVE_SIGPROCMASK FALSE)
   set(PHP_HAVE_SOCKET TRUE)
   set(PHP_HAVE_SOCKET_LIBRARY ws2_32)
+  set(PHP_HAVE_SOCKLEN_T TRUE)
   set(PHP_HAVE_STATFS FALSE)
   set(PHP_HAVE_STATVFS FALSE)
   set(PHP_HAVE_STD_SYSLOG FALSE)
   set(PHP_HAVE_STRINGS_H FALSE)
   set(PHP_HAVE_STRLCAT FALSE)
   set(PHP_HAVE_STRLCPY FALSE)
+  set(PHP_HAVE_STRUCT_FLOCK FALSE)
   set(PHP_HAVE_STRUCT_SOCKADDR_SA_LEN FALSE)
+  set(PHP_HAVE_STRUCT_SOCKADDR_STORAGE FALSE)
   set(PHP_HAVE_STRUCT_STAT_ST_BLKSIZE FALSE)
   set(PHP_HAVE_STRUCT_STAT_ST_BLOCKS FALSE)
   set(PHP_HAVE_STRUCT_STAT_ST_RDEV TRUE)
@@ -237,6 +235,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_HAVE_SYSEXITS_H FALSE)
   set(PHP_HAVE_TMMINTRIN_H TRUE)
   set(PHP_HAVE_TZSET TRUE)
+  set(PHP_HAVE_UID_T FALSE)
   set(PHP_HAVE_UNISTD_H FALSE)
   set(PHP_HAVE_UNIX_H FALSE)
   set(PHP_HAVE_UNSETENV FALSE)
@@ -266,19 +265,19 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_ZEND_HAVE_PTHREAD_STACKSEG_NP FALSE)
   set(PHP_ZEND_HAVE_STRNLEN TRUE)
 
-  set(HAVE_SIZEOF_INT TRUE)
+  set(PHP_HAVE_INT TRUE)
   set(SIZEOF_INT 4)
 
-  set(HAVE_SIZEOF_LONG TRUE)
+  set(PHP_HAVE_LONG TRUE)
   set(SIZEOF_LONG 4)
 
-  set(HAVE_SIZEOF_LONG_LONG TRUE)
+  set(PHP_HAVE_LONG_LONG TRUE)
   set(SIZEOF_LONG_LONG 8)
 
-  set(HAVE_SIZEOF_OFF_T TRUE)
+  set(PHP_HAVE_OFF_T TRUE)
   set(SIZEOF_OFF_T 4)
 
-  set(HAVE_SIZEOF_SIZE_T TRUE)
+  set(PHP_HAVE_SIZE_T TRUE)
   if(CMAKE_SIZEOF_VOID_P EQUAL 4)
     set(SIZEOF_SIZE_T 4)
   else()

cmake/ext/ffi/CMakeLists.txt

@@ -80,8 +80,12 @@ set_package_properties(
 
 target_link_libraries(php_ext_ffi PRIVATE FFI::FFI)
 
-check_type_size("long double" PHP_EXT_FFI_LONG_DOUBLE)
-set(HAVE_LONG_DOUBLE ${HAVE_PHP_EXT_FFI_LONG_DOUBLE})
+check_type_size(
+  "long double"
+  PHP_EXT_FFI_SIZEOF_LONG_DOUBLE
+  RESULT_VARIABLE PHP_EXT_FFI_HAVE_LONG_DOUBLE
+)
+set(HAVE_LONG_DOUBLE ${PHP_EXT_FFI_HAVE_LONG_DOUBLE})
 
 if(TARGET FFI::FFI)
   cmake_push_check_state(RESET)

cmake/ext/pcntl/CMakeLists.txt

@@ -225,10 +225,14 @@ cmake_pop_check_state()
 
 cmake_push_check_state(RESET)
   set(CMAKE_EXTRA_INCLUDE_FILES "signal.h")
-  check_type_size(siginfo_t PHP_EXT_PCNTL_STRUCT_SIGINFO_T)
+  check_type_size(
+    siginfo_t
+    PHP_EXT_PCNTL_SIZEOF_STRUCT_SIGINFO_T
+    RESULT_VARIABLE PHP_EXT_PCNTL_HAVE_STRUCT_SIGINFO_T
+  )
 cmake_pop_check_state()
 
-if(HAVE_PHP_EXT_PCNTL_STRUCT_SIGINFO_T)
+if(PHP_EXT_PCNTL_HAVE_STRUCT_SIGINFO_T)
   target_compile_definitions(php_ext_pcntl PRIVATE HAVE_STRUCT_SIGINFO_T)
 endif()
 

cmake/ext/sockets/CMakeLists.txt

@@ -154,16 +154,24 @@ set(
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
   set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h")
-  check_type_size("struct ucred" PHP_EXT_SOCKETS_STRUCT_UCRED)
+  check_type_size(
+    "struct ucred"
+    PHP_EXT_SOCKETS_SIZEOF_STRUCT_UCRED
+    RESULT_VARIABLE PHP_EXT_SOCKETS_HAVE_STRUCT_UCRED
+  )
 cmake_pop_check_state()
-set(HAVE_STRUCT_UCRED ${HAVE_PHP_EXT_SOCKETS_STRUCT_UCRED})
+set(HAVE_STRUCT_UCRED ${PHP_EXT_SOCKETS_HAVE_STRUCT_UCRED})
 
 # Check for struct cmsgcred.
 cmake_push_check_state(RESET)
   set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h")
-  check_type_size("struct cmsgcred" PHP_EXT_SOCKETS_STRUCT_CMSGCRED)
+  check_type_size(
+    "struct cmsgcred"
+    PHP_EXT_SOCKETS_SIZEOF_STRUCT_CMSGCRED
+    RESULT_VARIABLE PHP_EXT_SOCKETS_HAVE_STRUCT_CMSGCRED
+  )
 cmake_pop_check_state()
-set(HAVE_STRUCT_CMSGCRED ${HAVE_PHP_EXT_SOCKETS_STRUCT_CMSGCRED})
+set(HAVE_STRUCT_CMSGCRED ${PHP_EXT_SOCKETS_HAVE_STRUCT_CMSGCRED})
 
 set(HAVE_SOCKETS TRUE)
 

cmake/ext/sysvsem/CMakeLists.txt

@@ -74,8 +74,12 @@ target_sources(
 
 cmake_push_check_state(RESET)
   set(CMAKE_EXTRA_INCLUDE_FILES "sys/types.h;sys/ipc.h;sys/sem.h")
-  check_type_size("union semun" PHP_EXT_SYSVSEM_UNION_SEMUN)
-  set(HAVE_UNION_SEMUN ${HAVE_PHP_EXT_SYSVSEM_UNION_SEMUN})
+  check_type_size(
+    "union semun"
+    PHP_EXT_SYSVSEM_SIZEOF_UNION_SEMUN
+    RESULT_VARIABLE PHP_EXT_SYSVSEM_HAVE_UNION_SEMUN
+  )
+  set(HAVE_UNION_SEMUN ${PHP_EXT_SYSVSEM_HAVE_UNION_SEMUN})
 cmake_pop_check_state()
 
 set(HAVE_SYSVSEM TRUE)