Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -398,12 +398,6 @@ else()
   message(CHECK_FAIL "no")
 endif()
 
-# Check getaddrinfo().
-include(PHP/CheckGetaddrinfo)
-if(TARGET PHP::CheckGetaddrinfoLibrary)
-  target_link_libraries(php_config INTERFACE PHP::CheckGetaddrinfoLibrary)
-endif()
-
 ################################################################################
 # Miscellaneous checks.
 ################################################################################
@@ -412,6 +406,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckAVX512.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckCopyFileRange.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckFlushIo.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/CheckIPv6.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckReentrantFunctions.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/checks/CheckWrite.cmake)
@@ -484,11 +480,6 @@ endif()
 # Check for variable __attribute__((aligned)) support in the compiler.
 php_check_variable_attribute(aligned HAVE_ATTRIBUTE_ALIGNED)
 
-include(PHP/CheckGethostbynameR)
-if(TARGET PHP::CheckGethostbynameR)
-  target_link_libraries(php_config INTERFACE PHP::CheckGethostbynameR)
-endif()
-
 ################################################################################
 # Check for required libraries.
 ################################################################################

cmake/cmake/modules/PHP/CheckGetaddrinfo.cmake renamed to cmake/cmake/checks/CheckGetaddrinfo.cmake

@@ -1,26 +1,9 @@
 #[=============================================================================[
-# PHP/CheckGetaddrinfo
+Check whether getaddrinfo() function is working as expected.
 
-Check for working `getaddrinfo()`.
+Result variables:
 
-## Cache variables
-
-* `HAVE_GETADDRINFO`
-
-  Whether `getaddrinfo()` function is working as expected.
-
-IMPORTED target:
-
-* `PHP::CheckGetaddrinfoLibrary`
-
-  If there is additional library to be linked for using `getaddrinfo()`.
-
-## Usage
-
-```cmake
-# CMakeLists.txt
-include(PHP/CheckGetaddrinfo)
-```
+* HAVE_GETADDRINFO
 #]=============================================================================]
 
 include_guard(GLOBAL)
@@ -29,7 +12,13 @@ include(CheckSourceRuns)
 include(CMakePushCheckState)
 include(PHP/SearchLibraries)
 
-message(CHECK_START "Checking for getaddrinfo()")
+set(HAVE_GETADDRINFO FALSE)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(HAVE_GETADDRINFO TRUE)
+  target_link_libraries(php_config INTERFACE ws2_32)
+  return()
+endif()
 
 # The getaddrinfo() is mostly in C library (Solaris 11.4, illumos...)
 php_search_libraries(
@@ -41,38 +30,34 @@ php_search_libraries(
     socket  # Solaris <= 11.3
     network # Haiku
     ws2_32  # Windows
-  LIBRARY_VARIABLE libraryForGetaddrinfo
+  LIBRARY_VARIABLE library
 )
-if(libraryForGetaddrinfo)
-  add_library(PHP::CheckGetaddrinfoLibrary INTERFACE IMPORTED GLOBAL)
-
-  target_link_libraries(
-    PHP::CheckGetaddrinfoLibrary
-    INTERFACE
-      ${libraryForGetaddrinfo}
-  )
+if(library)
+  target_link_libraries(php_config INTERFACE ${library})
 endif()
 
-# If the variable HAVE_GETADDRINFO has been overridden the module stops here.
-# For example, on Windows.
-if(HAVE_GETADDRINFO)
-  message(CHECK_PASS "yes (cached)")
+if(DEFINED PHP_HAS_GETADDRINFO)
+  if(PHP_HAS_GETADDRINFO)
+    set(HAVE_GETADDRINFO TRUE)
+  endif()
   return()
 endif()
 
+message(CHECK_START "Checking whether getaddrinfo() works")
+
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
-  if(TARGET PHP::CheckGetaddrinfoLibrary)
-    set(CMAKE_REQUIRED_LIBRARIES PHP::CheckGetaddrinfoLibrary)
+  if(library)
+    set(CMAKE_REQUIRED_LIBRARIES ${library})
   endif()
 
   if(
-    NOT DEFINED HAVE_GETADDRINFO_EXITCODE
+    NOT DEFINED PHP_HAS_GETADDRINFO_EXITCODE
     AND CMAKE_CROSSCOMPILING
     AND NOT CMAKE_CROSSCOMPILING_EMULATOR
     AND CMAKE_SYSTEM_NAME MATCHES "^(Linux|Midipix)$"
   )
-    set(HAVE_GETADDRINFO_EXITCODE 0)
+    set(PHP_HAS_GETADDRINFO_EXITCODE 0)
   endif()
 
   check_source_runs(C [[
@@ -116,10 +101,11 @@ cmake_push_check_state(RESET)
 
       return 0;
     }
-  ]] HAVE_GETADDRINFO)
+  ]] PHP_HAS_GETADDRINFO)
 cmake_pop_check_state()
 
-if(HAVE_GETADDRINFO)
+if(PHP_HAS_GETADDRINFO)
+  set(HAVE_GETADDRINFO TRUE)
   message(CHECK_PASS "yes")
 else()
   message(CHECK_FAIL "no")

cmake/cmake/modules/PHP/CheckGethostbynameR.cmake renamed to cmake/cmake/checks/CheckGethostbynameR.cmake

@@ -1,9 +1,7 @@
 #[=============================================================================[
-# PHP/CheckGethostbynameR
+Check 'gethostbyname_r()'.
 
-Check `gethostbyname_r()`.
-
-The non-standard `gethostbyname_r()` function has different signatures across
+The non-standard 'gethostbyname_r()' function has different signatures across
 systems:
 
 * Linux, BSD: 6 arguments
@@ -15,38 +13,12 @@ systems:
 See also:
 https://www.gnu.org/software/autoconf-archive/ax_func_which_gethostbyname_r.html
 
-## Cache variables
-
-* `HAVE_FUNC_GETHOSTBYNAME_R_6`
-
-  Whether `gethostbyname_r()` has 6 arguments.
-
-* `HAVE_FUNC_GETHOSTBYNAME_R_5`
-
-  Whether `gethostbyname_r()` has 5 arguments.
-
-* `HAVE_FUNC_GETHOSTBYNAME_R_3`
-
-  Whether `gethostbyname_r()` has 3 arguments.
-
-## Result variables
-
-* `HAVE_GETHOSTBYNAME_R`
-
-  Whether `gethostbyname_r()` is available.
-
-## INTERFACE library
-
-* `PHP::CheckGethostbynameR`
+Result variables:
 
-  Created when additional system library needs to be linked.
-
-## Usage
-
-```cmake
-# CMakeLists.txt
-include(PHP/CheckGethostbynameR)
-```
+* HAVE_FUNC_GETHOSTBYNAME_R_6 - Whether 'gethostbyname_r()' has 6 arguments.
+* HAVE_FUNC_GETHOSTBYNAME_R_5 - Whether 'gethostbyname_r()' has 5 arguments.
+* HAVE_FUNC_GETHOSTBYNAME_R_3 - Whether 'gethostbyname_r()' has 3 arguments.
+* HAVE_GETHOSTBYNAME_R - Whether 'gethostbyname_r()' is available.
 #]=============================================================================]
 
 include_guard(GLOBAL)
@@ -55,6 +27,15 @@ include(CheckPrototypeDefinition)
 include(CMakePushCheckState)
 include(PHP/SearchLibraries)
 
+set(HAVE_FUNC_GETHOSTBYNAME_R_6 FALSE)
+set(HAVE_FUNC_GETHOSTBYNAME_R_5 FALSE)
+set(HAVE_FUNC_GETHOSTBYNAME_R_3 FALSE)
+set(HAVE_GETHOSTBYNAME_R FALSE)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  return()
+endif()
+
 function(_php_check_gethostbyname_r)
   message(CHECK_START "Checking number of gethostbyname_r() arguments")
 
@@ -74,9 +55,7 @@ function(_php_check_gethostbyname_r)
   endif()
 
   if(library)
-    add_library(php_check_gethostbyname_r INTERFACE)
-    add_library(PHP::CheckGethostbynameR ALIAS php_check_gethostbyname_r)
-    target_link_libraries(php_check_gethostbyname_r INTERFACE ${library})
+    target_link_libraries(php_config INTERFACE ${library})
   endif()
 
   # Check for 6 arguments signature.
@@ -86,9 +65,9 @@ function(_php_check_gethostbyname_r)
       size_t buflen, struct hostent **result, int *h_errnop)"
     "0"
     netdb.h
-    HAVE_FUNC_GETHOSTBYNAME_R_6
+    PHP_HAS_GETHOSTBYNAME_R_6
   )
-  if(HAVE_FUNC_GETHOSTBYNAME_R_6)
+  if(PHP_HAS_GETHOSTBYNAME_R_6)
     message(CHECK_PASS "six")
     return()
   endif()
@@ -100,9 +79,9 @@ function(_php_check_gethostbyname_r)
       char *buffer, int buflen, int *h_errnop)"
     "0"
     netdb.h
-    HAVE_FUNC_GETHOSTBYNAME_R_5
+    PHP_HAS_GETHOSTBYNAME_R_5
   )
-  if(HAVE_FUNC_GETHOSTBYNAME_R_5)
+  if(PHP_HAS_GETHOSTBYNAME_R_5)
     message(CHECK_PASS "five")
     return()
   endif()
@@ -114,9 +93,9 @@ function(_php_check_gethostbyname_r)
       struct hostent_data *data)"
     "0"
     netdb.h
-    HAVE_FUNC_GETHOSTBYNAME_R_3
+    PHP_HAS_GETHOSTBYNAME_R_3
   )
-  if(HAVE_FUNC_GETHOSTBYNAME_R_3)
+  if(PHP_HAS_GETHOSTBYNAME_R_3)
     message(CHECK_PASS "three")
     return()
   endif()
@@ -129,6 +108,18 @@ cmake_push_check_state(RESET)
   _php_check_gethostbyname_r()
 cmake_pop_check_state()
 
+if(PHP_HAS_GETHOSTBYNAME_R_6)
+  set(HAVE_FUNC_GETHOSTBYNAME_R_6 TRUE)
+endif()
+
+if(PHP_HAS_GETHOSTBYNAME_R_5)
+  set(HAVE_FUNC_GETHOSTBYNAME_R_5 TRUE)
+endif()
+
+if(PHP_HAS_GETHOSTBYNAME_R_3)
+  set(HAVE_FUNC_GETHOSTBYNAME_R_3 TRUE)
+endif()
+
 if(
   HAVE_FUNC_GETHOSTBYNAME_R_6
   OR HAVE_FUNC_GETHOSTBYNAME_R_5

cmake/cmake/platforms/Windows.cmake

@@ -23,9 +23,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   # PHP has ftok() emulation implemented on Windows.
   set(HAVE_FTOK TRUE)
 
-  # PHP has unconditional getaddrinfo() support on Windows.
-  set(HAVE_GETADDRINFO TRUE)
-
   # PHP has unconditional support for getcwd() on Windows.
   set(HAVE_GETCWD TRUE)
 

cmake/cmake/toolchains/template.cmake

@@ -19,9 +19,6 @@ set(CMAKE_FIND_ROOT_PATH "")
 # 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 for the getaddrinfo() check.
-set(HAVE_GETADDRINFO_EXITCODE 0)
-
 # Set the exit codes for the alignment segments checks.
 # See PHP/CheckSegmentsAlignment.cmake
 set(PHP_HAS_ALIGNMENT_FLAGS_C_EXITCODE 0)
@@ -32,6 +29,9 @@ set(PHP_HAS_MAX_PAGE_SIZE_CXX_EXITCODE 0)
 # Set the exit code if flush should be called explicitly after a buffered io.
 set(PHP_HAS_FLUSHIO_EXITCODE 1)
 
+# Set the exit code for the getaddrinfo() check.
+set(PHP_HAS_GETADDRINFO_EXITCODE 0)
+
 # Set the exit code to 1 when using Clang 17 or later and -fno-sanitize=function
 # needs to be added for the PHP_UNDEFINED_SANITIZER option, otherwise set to 0.
 set(PHP_HAS_UBSAN_EXITCODE 0)