Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/Zend/CMakeLists.txt

@@ -459,6 +459,7 @@ php_search_libraries(
   Pgrab
   HEADERS libproc.h
   LIBRARIES proc
+  VARIABLE PHP_ZEND_HAS_PGRAB
   TARGET zend PRIVATE
 )
 

cmake/Zend/cmake/MaxExecutionTimers.cmake

@@ -4,7 +4,6 @@ Check whether to enable Zend max execution timers.
 Cache variables:
 
 * ZEND_MAX_EXECUTION_TIMERS
-* HAVE_TIMER_CREATE - Whether the system has timer_create().
 
 Result variables:
 
@@ -50,20 +49,20 @@ if(ZEND_MAX_EXECUTION_TIMERS AND CMAKE_SYSTEM_NAME MATCHES "^(Linux|FreeBSD)$")
     HEADERS time.h
     LIBRARIES
       rt # Solaris <= 10, older Linux
-    VARIABLE HAVE_TIMER_CREATE
-    LIBRARY_VARIABLE libraryForTimerCreate
+    VARIABLE PHP_ZEND_HAS_TIMER_CREATE
+    LIBRARY_VARIABLE PHP_ZEND_HAS_TIMER_CREATE_LIBRARY
   )
 
-  if(NOT HAVE_TIMER_CREATE)
+  if(NOT PHP_ZEND_HAS_TIMER_CREATE)
     set(ZEND_MAX_EXECUTION_TIMERS OFF)
   endif()
 else()
   set(ZEND_MAX_EXECUTION_TIMERS OFF)
 endif()
 
 if(ZEND_MAX_EXECUTION_TIMERS)
-  if(libraryForTimerCreate)
-    target_link_libraries(zend PUBLIC ${libraryForTimerCreate})
+  if(PHP_ZEND_HAS_TIMER_CREATE_LIBRARY)
+    target_link_libraries(zend PUBLIC ${PHP_ZEND_HAS_TIMER_CREATE_LIBRARY})
   endif()
 
   # zend_config.h (or its parent php_config.h) isn't included in some files,

cmake/cmake/ConfigureChecks.cmake

@@ -413,6 +413,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckFnmatch.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckFopencookie.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckGetaddrinfo.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckGethostbynameR.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckGetifaddrs.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckIPv6.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckReentrantFunctions.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckWrite.cmake)
@@ -493,14 +494,16 @@ php_search_libraries(
   dlopen
   HEADERS dlfcn.h
   LIBRARIES ${CMAKE_DL_LIBS}
-  VARIABLE HAVE_LIBDL
+  VARIABLE PHP_HAS_DYNAMIC_LOADING
   TARGET php_config INTERFACE
 )
+set(HAVE_LIBDL ${PHP_HAS_DYNAMIC_LOADING})
 
 php_search_libraries(
   sin
   HEADERS math.h
   LIBRARIES m
+  VARIABLE PHP_HAS_SIN
   TARGET php_config INTERFACE
 )
 
@@ -522,6 +525,8 @@ php_search_libraries(
     socket  # Solaris <= 11.3, illumos
     network # Haiku
     ws2_32  # Windows
+  VARIABLE PHP_HAS_SOCKET
+  LIBRARY_VARIABLE PHP_HAS_SOCKET_LIBRARY
   TARGET php_config INTERFACE
 )
 
@@ -532,9 +537,10 @@ php_search_libraries(
   LIBRARIES
     socket  # Solaris <= 11.3, illumos
     network # Haiku
-  VARIABLE HAVE_SOCKETPAIR
+  VARIABLE PHP_HAS_SOCKETPAIR
   TARGET php_config INTERFACE
 )
+set(HAVE_SOCKETPAIR ${PHP_HAS_SOCKETPAIR})
 
 # The gethostname() is mostly in C library (Solaris/illumos...)
 php_search_libraries(
@@ -545,9 +551,11 @@ php_search_libraries(
   LIBRARIES
     network # Haiku
     ws2_32  # Windows
-  VARIABLE HAVE_GETHOSTNAME
+  VARIABLE PHP_HAS_GETHOSTNAME
+  LIBRARY_VARIABLE PHP_HAS_GETHOSTNAME_LIBRARY
   TARGET php_config INTERFACE
 )
+set(HAVE_GETHOSTNAME ${PHP_HAS_GETHOSTNAME})
 
 # The gethostbyaddr() is mostly in C library (Solaris 11.4...)
 php_search_libraries(
@@ -560,6 +568,8 @@ php_search_libraries(
     nsl     # Solaris <= 11.3, illumos
     network # Haiku
     ws2_32  # Windows
+  VARIABLE PHP_HAS_GETHOSTBYADDR
+  LIBRARY_VARIABLE PHP_HAS_GETHOSTBYADDR_LIBRARY
   TARGET php_config INTERFACE
 )
 
@@ -575,9 +585,10 @@ php_search_libraries(
   LIBRARIES
     util # Some BSD-based systems
     bsd  # Haiku
-  VARIABLE HAVE_OPENPTY
+  VARIABLE PHP_HAS_OPENPTY
   TARGET php_config INTERFACE
 )
+set(HAVE_OPENPTY ${PHP_HAS_OPENPTY})
 
 # The inet_ntop() is mostly in C library (Solaris 11.4, illumos, BSD*, Linux...)
 php_search_libraries(
@@ -591,6 +602,7 @@ php_search_libraries(
     network # Haiku
     ws2_32  # Windows
   VARIABLE PHP_HAS_INET_NTOP
+  LIBRARY_VARIABLE PHP_HAS_INET_NTOP_LIBRARY
   TARGET php_config INTERFACE
 )
 if(NOT PHP_HAS_INET_NTOP)
@@ -609,6 +621,7 @@ php_search_libraries(
     network # Haiku
     ws2_32  # Windows
   VARIABLE PHP_HAS_INET_PTON
+  LIBRARY_VARIABLE PHP_HAS_INET_PTON_LIBRARY
   TARGET php_config INTERFACE
 )
 if(NOT PHP_HAS_INET_PTON)
@@ -622,9 +635,10 @@ php_search_libraries(
     time.h
   LIBRARIES
     rt # Solaris <= 10
-  VARIABLE HAVE_NANOSLEEP
+  VARIABLE PHP_HAS_NANOSLEEP
   TARGET php_config INTERFACE
 )
+set(HAVE_NANOSLEEP ${PHP_HAS_NANOSLEEP})
 
 # The setsockopt() is mostly in C library (Solaris 11.4...)
 php_search_libraries(
@@ -637,6 +651,8 @@ php_search_libraries(
     socket  # Solaris <= 11.3, illumos
     network # Haiku
     ws2_32  # Windows
+  VARIABLE PHP_HAS_SETSOCKOPT
+  LIBRARY_VARIABLE PHP_HAS_SETSOCKOPT_LIBRARY
   TARGET php_config INTERFACE
 )
 
@@ -649,9 +665,10 @@ php_search_libraries(
   LIBRARIES
     socket  # Solaris <= 11.3, illumos
     network # Haiku
-  VARIABLE HAVE_GAI_STRERROR
+  VARIABLE PHP_HAS_GAI_STRERROR
   TARGET php_config INTERFACE
 )
+set(HAVE_GAI_STRERROR ${PHP_HAS_GAI_STRERROR})
 
 # The getprotobyname() is mostly in C library (Solaris 11.4...)
 php_search_libraries(
@@ -663,9 +680,11 @@ php_search_libraries(
     socket  # Solaris <= 11.3, illumos
     network # Haiku
     ws2_32  # Windows
-  VARIABLE HAVE_GETPROTOBYNAME
+  VARIABLE PHP_HAS_GETPROTOBYNAME
+  LIBRARY_VARIABLE PHP_HAS_GETPROTOBYNAME_LIBRARY
   TARGET php_config INTERFACE
 )
+set(HAVE_GETPROTOBYNAME ${PHP_HAS_GETPROTOBYNAME})
 
 # The getprotobynumber() is mostly in C library (Solaris 11.4...)
 php_search_libraries(
@@ -677,9 +696,11 @@ php_search_libraries(
     socket  # Solaris <= 11.3, illumos
     network # Haiku
     ws2_32  # Windows
-  VARIABLE HAVE_GETPROTOBYNUMBER
+  VARIABLE PHP_HAS_GETPROBYNUMBER
+  LIBRARY_VARIABLE PHP_HAS_GETPROBYNUMBER_LIBRARY
   TARGET php_config INTERFACE
 )
+set(HAVE_GETPROTOBYNUMBER ${PHP_HAS_GETPROBYNUMBER})
 
 # The getservbyname() is mostly in C library (Solaris 11.4...)
 php_search_libraries(
@@ -691,9 +712,11 @@ php_search_libraries(
     socket  # Solaris <= 11.3, illumos
     network # Haiku
     ws2_32  # Windows
-  VARIABLE HAVE_GETSERVBYNAME
+  VARIABLE PHP_HAS_GETSERVBYNAME
+  LIBRARY_VARIABLE PHP_HAS_GETSERVBYNAME_LIBRARY
   TARGET php_config INTERFACE
 )
+set(HAVE_GETSERVBYNAME ${PHP_HAS_GETSERVBYNAME})
 
 # The getservbyport() is mostly in C library (Solaris 11.4...)
 php_search_libraries(
@@ -705,9 +728,11 @@ php_search_libraries(
     socket  # Solaris <= 11.3, illumos
     network # Haiku
     ws2_32  # Windows
-  VARIABLE HAVE_GETSERVBYPORT
+  VARIABLE PHP_HAS_GETSERVBYPORT
+  LIBRARY_VARIABLE PHP_HAS_GETSERVBYPORT_LIBRARY
   TARGET php_config INTERFACE
 )
+set(HAVE_GETSERVBYPORT ${PHP_HAS_GETSERVBYPORT})
 
 # The shutdown() is mostly in C library (Solaris 11.4...)
 php_search_libraries(
@@ -719,9 +744,11 @@ php_search_libraries(
     socket  # Solaris <= 11.3, illumos
     network # Haiku
     ws2_32  # Windows
-  VARIABLE HAVE_SHUTDOWN
+  VARIABLE PHP_HAS_SHUTDOWN
+  LIBRARY_VARIABLE PHP_HAS_SHUTDOWN_LIBRARY
   TARGET php_config INTERFACE
 )
+set(HAVE_SHUTDOWN ${PHP_HAS_SHUTDOWN})
 
 block()
   if(PHP_LIBGCC)