Merge branch 'PHP-8.4' into PHP-8.5

Author: petk

cmake/cmake/checks/CheckGetaddrinfo.cmake

@@ -2,95 +2,77 @@
 Check whether getaddrinfo() function is working as expected.
 #]=============================================================================]
 
-include(CheckSourceRuns)
-include(CMakePushCheckState)
 include(PHP/SearchLibraries)
 
-# The getaddrinfo() is mostly in C library (Solaris 11.4, illumos...)
-php_search_libraries(
-  SYMBOL getaddrinfo
-  HEADERS
-    netdb.h
-    ws2tcpip.h
-  LIBRARIES
-    socket  # Solaris <= 11.3
-    network # Haiku
-    ws2_32  # Windows
-  RESULT_VARIABLE PHP_HAVE_GETADDRINFO_SYMBOL
-  LIBRARY_VARIABLE PHP_HAVE_GETADDRINFO_LIBRARY
-)
-
-if(PHP_HAVE_GETADDRINFO_SYMBOL AND NOT DEFINED PHP_HAVE_GETADDRINFO)
-  message(CHECK_START "Checking whether getaddrinfo() works")
-
-  cmake_push_check_state(RESET)
-    set(CMAKE_REQUIRED_QUIET TRUE)
-    if(PHP_HAVE_GETADDRINFO_LIBRARY)
-      set(CMAKE_REQUIRED_LIBRARIES ${PHP_HAVE_GETADDRINFO_LIBRARY})
-    endif()
+# On Windows, getaddrinfo() and its implementation in PHP are supported.
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(PHP_HAVE_GETADDRINFO TRUE)
+  set(PHP_HAVE_GETADDRINFO_LIBRARY ws2_32)
+endif()
 
-    if(
-      CMAKE_CROSSCOMPILING
-      AND NOT CMAKE_CROSSCOMPILING_EMULATOR
-      AND NOT DEFINED PHP_HAVE_GETADDRINFO_EXITCODE
-      AND CMAKE_SYSTEM_NAME MATCHES "^(Linux|Midipix)$"
-    )
-      set(PHP_HAVE_GETADDRINFO_EXITCODE 0)
-    endif()
+if(
+  CMAKE_CROSSCOMPILING
+  AND NOT CMAKE_CROSSCOMPILING_EMULATOR
+  AND NOT DEFINED PHP_HAVE_GETADDRINFO_EXITCODE
+  AND CMAKE_SYSTEM_NAME MATCHES "^(Linux|Midipix)$"
+)
+  set(PHP_HAVE_GETADDRINFO_EXITCODE 0)
+endif()
 
-    check_source_runs(C [[
-      #include <netdb.h>
-      #include <sys/types.h>
-      #include <string.h>
-      #include <stdlib.h>
-      #ifndef AF_INET
-      # include <sys/socket.h>
-      #endif
+# The getaddrinfo() is mostly in C library (Solaris 11.4, illumos...)
+php_search_libraries(
+  SOURCE_RUNS [[
+    #include <netdb.h>
+    #include <sys/types.h>
+    #include <string.h>
+    #include <stdlib.h>
+    #ifndef AF_INET
+    # include <sys/socket.h>
+    #endif
+
+    int main(void)
+    {
+      struct addrinfo *ai, *pai, hints;
+
+      memset(&hints, 0, sizeof(hints));
+      hints.ai_flags = AI_NUMERICHOST;
+
+      if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) {
+        return 1;
+      }
 
-      int main(void)
-      {
-        struct addrinfo *ai, *pai, hints;
+      if (ai == 0) {
+        return 1;
+      }
 
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_flags = AI_NUMERICHOST;
+      pai = ai;
 
-        if (getaddrinfo("127.0.0.1", 0, &hints, &ai) < 0) {
+      while (pai) {
+        if (pai->ai_family != AF_INET) {
+          /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
           return 1;
         }
-
-        if (ai == 0) {
+        if (pai->ai_addr->sa_family != AF_INET) {
+          /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
           return 1;
         }
-
-        pai = ai;
-
-        while (pai) {
-          if (pai->ai_family != AF_INET) {
-            /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
-            return 1;
-          }
-          if (pai->ai_addr->sa_family != AF_INET) {
-            /* 127.0.0.1/NUMERICHOST should only resolve ONE way */
-            return 1;
-          }
-          pai = pai->ai_next;
-        }
-        freeaddrinfo(ai);
-
-        return 0;
+        pai = pai->ai_next;
       }
-    ]] PHP_HAVE_GETADDRINFO)
-  cmake_pop_check_state()
-
-  if(PHP_HAVE_GETADDRINFO)
-    message(CHECK_PASS "yes")
-  else()
-    message(CHECK_FAIL "no")
-  endif()
-endif()
+      freeaddrinfo(ai);
 
-if(PHP_HAVE_GETADDRINFO AND PHP_HAVE_GETADDRINFO_LIBRARY)
-  target_link_libraries(php_config INTERFACE ${PHP_HAVE_GETADDRINFO_LIBRARY})
-endif()
+      return 0;
+    }
+  ]]
+  HEADERS
+    netdb.h
+    ws2tcpip.h
+  LIBRARIES
+    socket  # Solaris <= 11.3
+    network # Haiku
+    ws2_32  # Windows
+  RESULT_VARIABLE PHP_HAVE_GETADDRINFO
+  LIBRARY_VARIABLE PHP_HAVE_GETADDRINFO_LIBRARY
+  TARGET php_config INTERFACE
+)
 
 set(HAVE_GETADDRINFO "${PHP_HAVE_GETADDRINFO}")

cmake/cmake/checks/CheckGetifaddrs.cmake

@@ -12,7 +12,7 @@ few noted exceptions below. Some systems also need <sys/types.h> header
 include(PHP/SearchLibraries)
 
 php_search_libraries(
-  SOURCE [[
+  SOURCE_COMPILES [[
     #include <sys/types.h>
     #include <ifaddrs.h>
 

cmake/cmake/checks/CheckIPv6.cmake

@@ -30,7 +30,7 @@ cmake_push_check_state(RESET)
   # On some systems, additional library is needed for the in6addr_any variable
   # (from <netinet/in.h>).
   php_search_libraries(
-    SOURCE [[
+    SOURCE_COMPILES [[
       #include <sys/types.h>
       #include <sys/socket.h>
       #include <netinet/in.h>

cmake/cmake/modules/PHP/SearchLibraries.cmake

@@ -38,7 +38,7 @@ given headers, and determines if additional libraries need to be linked:
 
 ```cmake
 php_search_libraries(
-  SYMBOL <symbol> | SOURCE <code>
+  SYMBOL <symbol> | SOURCE_COMPILES <code> | SOURCE_RUNS <code>
   [HEADERS <headers>...]
   [LIBRARIES <libraries>...]
   [RESULT_VARIABLE <var>]
@@ -59,10 +59,16 @@ libraries and links the first one in which the symbol is found.
 
   The name of the C symbol to check.
 
-* `SOURCE <code>`
+* `SOURCE_COMPILES <code>`
 
   This argument can be used to check whether the specified C source `<code>` can
-  be compiled and linked, instead of a `SYMBOL <symbol>` argument.
+  be compiled and linked, instead of a `SYMBOL`, or `SOURCE_RUNS` argument.
+
+* `SOURCE_RUNS <code>`
+
+  This argument can be used to check whether the specified C source `<code>` can
+  be compiled, linked, and run, instead of a `SYMBOL`, or `SOURCE_COMPILES`
+  argument.
 
 * `HEADERS <headers>...`
 
@@ -73,8 +79,8 @@ libraries and links the first one in which the symbol is found.
   example, to be able to use `<arpa/nameser.h>` header on Solaris, the
   `<sys/types.h>` header must be included before.
 
-  When using `SOURCE <code>` argument, `<headers>` are prepended to the C source
-  `<code>` using `#include <header>...`.
+  When using `SOURCE_COMPILES`, or `SOURCE_RUNS` argument, `<headers>` are
+  prepended to the C source `<code>` using `#include <header>...`.
 
 * `LIBRARIES <libraries>...`
 
@@ -193,7 +199,7 @@ internal cache variable.
 include(PHP/SearchLibraries)
 
 php_search_libraries(
-  SOURCE [[
+  SOURCE_COMPILES [[
     #include <sys/types.h>
     #include <sys/socket.h>
     #include <netinet/in.h>
@@ -224,6 +230,7 @@ include_guard(GLOBAL)
 
 include(CheckIncludeFiles)
 include(CheckSourceCompiles)
+include(CheckSourceRuns)
 include(CheckSymbolExists)
 include(CMakePushCheckState)
 
@@ -234,39 +241,64 @@ macro(_php_search_libraries_populate)
   endif()
 endmacro()
 
-function(_php_search_libraries_check_source source headers result)
+function(_php_search_libraries_check_source_compiles source headers result)
   foreach(header IN LISTS headers)
     string(PREPEND source "#include <${header}>\n")
   endforeach()
 
   check_source_compiles(C "${source}" ${result})
 endfunction()
 
+function(_php_search_libraries_check_source_runs source headers result)
+  foreach(header IN LISTS headers)
+    string(PREPEND source "#include <${header}>\n")
+  endforeach()
+
+  check_source_runs(C "${source}" ${result})
+endfunction()
+
 function(php_search_libraries)
   cmake_parse_arguments(
     PARSE_ARGV
     0
     parsed # prefix
     "RECHECK_HEADERS" # options
-    "SYMBOL;SOURCE;RESULT_VARIABLE;LIBRARY_VARIABLE" # one-value keywords
+    "SYMBOL;SOURCE_COMPILES;SOURCE_RUNS;RESULT_VARIABLE;LIBRARY_VARIABLE" # one-value keywords
     "HEADERS;LIBRARIES;TARGET" # multi-value keywords
   )
 
   if(parsed_UNPARSED_ARGUMENTS)
     message(FATAL_ERROR "Unrecognized arguments: ${parsed_UNPARSED_ARGUMENTS}")
   endif()
 
-  if(NOT DEFINED parsed_SYMBOL AND NOT DEFINED parsed_SOURCE)
-    message(FATAL_ERROR "Missing SYMBOL or SOURCE argument")
-  elseif(DEFINED parsed_SYMBOL AND DEFINED parsed_SOURCE)
-    message(FATAL_ERROR "Use either SYMBOL or SOURCE argument. Not both.")
+  if(
+    NOT DEFINED parsed_SYMBOL
+    AND NOT DEFINED parsed_SOURCE_COMPILES
+    AND NOT DEFINED parsed_SOURCE_RUNS
+  )
+    message(
+      FATAL_ERROR
+      "Missing SYMBOL, SOURCE_COMPILES, or SOURCE_RUNS argument"
+    )
+  elseif(
+    (DEFINED parsed_SYMBOL AND DEFINED parsed_SOURCE_COMPILES)
+    OR (DEFINED parsed_SYMBOL AND DEFINED parsed_SOURCE_RUNS)
+    OR (DEFINED parsed_SOURCE_COMPILES AND DEFINED parsed_SOURCE_RUNS)
+  )
+    message(
+      FATAL_ERROR
+      "Use either SYMBOL, SOURCE_COMPILES, or SOURCE_RUNS argument. "
+      "Not multiple ones."
+    )
   endif()
 
   if(NOT parsed_RESULT_VARIABLE OR NOT parsed_LIBRARY_VARIABLE)
     if(DEFINED parsed_SYMBOL)
       set(id "${parsed_SYMBOL}")
-    elseif(DEFINED parsed_SOURCE)
-      set(id "${parsed_SOURCE}")
+    elseif(DEFINED parsed_SOURCE_COMPILES)
+      set(id "${parsed_SOURCE_COMPILES}")
+    elseif(DEFINED parsed_SOURCE_RUNS)
+      set(id "${parsed_SOURCE_RUNS}")
     endif()
 
     string(MD5 hash "${id}_${parsed_HEADERS}_${parsed_LIBRARIES}")
@@ -344,9 +376,15 @@ function(php_search_libraries)
       "${headersFound}"
       ${parsed_RESULT_VARIABLE}
     )
-  elseif(DEFINED parsed_SOURCE)
-    _php_search_libraries_check_source(
-      "${parsed_SOURCE}"
+  elseif(DEFINED parsed_SOURCE_COMPILES)
+    _php_search_libraries_check_source_compiles(
+      "${parsed_SOURCE_COMPILES}"
+      "${headersFound}"
+      ${parsed_RESULT_VARIABLE}
+    )
+  elseif(DEFINED parsed_SOURCE_RUNS)
+    _php_search_libraries_check_source_runs(
+      "${parsed_SOURCE_RUNS}"
       "${headersFound}"
       ${parsed_RESULT_VARIABLE}
     )
@@ -373,7 +411,7 @@ function(php_search_libraries)
           CHECK_START
           "Looking for ${parsed_SYMBOL} in library ${library}"
         )
-      elseif(DEFINED parsed_SOURCE)
+      elseif(DEFINED parsed_SOURCE_COMPILES OR DEFINED parsed_SOURCE_RUNS)
         message(
           CHECK_START
           "Performing test ${parsed_RESULT_VARIABLE} with library ${library}"
@@ -399,9 +437,15 @@ function(php_search_libraries)
           "${headersFound}"
           ${parsed_RESULT_VARIABLE}
         )
-      elseif(DEFINED parsed_SOURCE)
-        _php_search_libraries_check_source(
-          "${parsed_SOURCE}"
+      elseif(DEFINED parsed_SOURCE_COMPILES)
+        _php_search_libraries_check_source_compiles(
+          "${parsed_SOURCE_COMPILES}"
+          "${headersFound}"
+          ${parsed_RESULT_VARIABLE}
+        )
+      elseif(DEFINED parsed_SOURCE_RUNS)
+        _php_search_libraries_check_source_runs(
+          "${parsed_SOURCE_RUNS}"
           "${headersFound}"
           ${parsed_RESULT_VARIABLE}
         )
@@ -416,7 +460,7 @@ function(php_search_libraries)
       # Store found library in a cache variable for internal purpose.
       if(DEFINED parsed_SYMBOL)
         set(help "Library required to use the '${parsed_SYMBOL}' symbol.")
-      elseif(DEFINED parsed_SOURCE)
+      elseif(DEFINED parsed_SOURCE_COMPILES OR DEFINED parsed_SOURCE_RUNS)
         set(help "Library required for the '${parsed_RESULT_VARIABLE}' test.")
       endif()
       set(${parsed_LIBRARY_VARIABLE} ${library} CACHE INTERNAL "${help}")

cmake/cmake/platforms/Windows.cmake

@@ -137,9 +137,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_HAVE_FORK FALSE)
   set(PHP_HAVE_FUNOPEN FALSE)
   set(PHP_HAVE_GAI_STRERROR FALSE)
-  set(PHP_HAVE_GETADDRINFO TRUE)
-  set(PHP_HAVE_GETADDRINFO_LIBRARY ws2_32)
-  set(PHP_HAVE_GETADDRINFO_SYMBOL TRUE)
   set(PHP_HAVE_GETGRNAM_R FALSE)
   set(PHP_HAVE_GETHOSTNAME TRUE)
   set(PHP_HAVE_GETHOSTNAME_LIBRARY ws2_32)