Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -676,7 +676,9 @@ php_search_libraries(
 # The gai_strerror() is mostly in C library (Solaris 11.4...)
 php_search_libraries(
   gai_strerror
-  HEADERS netdb.h
+  HEADERS
+    netdb.h
+    ws2tcpip.h
   LIBRARIES
     socket  # Solaris <= 11.3, illumos
     network # Haiku

cmake/cmake/Flags.cmake

@@ -4,6 +4,7 @@ Check and configure compilation options.
 
 include_guard(GLOBAL)
 
+include(CheckLinkerFlag)
 include(CheckSourceRuns)
 include(CMakePushCheckState)
 include(PHP/CheckCompilerFlag)
@@ -75,13 +76,23 @@ target_compile_options(
 
 php_check_compiler_flag(C -Wall PHP_HAS_WALL_C)
 php_check_compiler_flag(CXX -Wall PHP_HAS_WALL_CXX)
-target_compile_options(
-  php_config
-  BEFORE
-  INTERFACE
-    $<$<AND:$<BOOL:${PHP_HAS_WALL_C}>,$<COMPILE_LANGUAGE:ASM,C>>:-Wall>
-    $<$<AND:$<BOOL:${PHP_HAS_WALL_CXX}>,$<COMPILE_LANGUAGE:CXX>>:-Wall>
-)
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  target_compile_options(
+    php_config
+    BEFORE
+    INTERFACE
+      $<$<AND:$<BOOL:${PHP_HAS_WALL_C}>,$<CONFIG:Debug>,$<COMPILE_LANGUAGE:ASM,C>>:-Wall>
+      $<$<AND:$<BOOL:${PHP_HAS_WALL_CXX}>,$<CONFIG:Debug>,$<COMPILE_LANGUAGE:CXX>>:-Wall>
+  )
+else()
+  target_compile_options(
+    php_config
+    BEFORE
+    INTERFACE
+      $<$<AND:$<BOOL:${PHP_HAS_WALL_C}>,$<COMPILE_LANGUAGE:ASM,C>>:-Wall>
+      $<$<AND:$<BOOL:${PHP_HAS_WALL_CXX}>,$<COMPILE_LANGUAGE:CXX>>:-Wall>
+  )
+endif()
 
 # Check if compiler supports -Wno-clobbered (only GCC).
 php_check_compiler_flag(C -Wno-clobbered PHP_HAS_WNO_CLOBBERED_C)
@@ -485,3 +496,19 @@ endif()
 
 # Align segments on huge page boundary.
 include(PHP/CheckSegmentsAlignment)
+
+check_linker_flag(C LINKER:/verbose PHP_HAS_VERBOSE_LINKER_FLAG_C)
+if(PHP_HAS_VERBOSE_LINKER_FLAG_C)
+  target_link_options(
+    php_config
+    INTERFACE $<$<AND:$<CONFIG:Debug>,$<LINK_LANGUAGE:C>>:LINKER:/verbose>
+  )
+endif()
+
+check_linker_flag(CXX LINKER:/verbose PHP_HAS_VERBOSE_LINKER_FLAG_CXX)
+if(PHP_HAS_VERBOSE_LINKER_FLAG_CXX)
+  target_link_options(
+    php_config
+    INTERFACE $<$<AND:$<CONFIG:Debug>,$<LINK_LANGUAGE:CXX>>:LINKER:/verbose>
+  )
+endif()

cmake/cmake/modules/PHP/CheckIPv6.cmake

@@ -29,6 +29,12 @@ if(NOT PHP_IPV6)
   return()
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  message(CHECK_PASS "yes")
+  set(HAVE_IPV6 TRUE)
+  return()
+endif()
+
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
 

cmake/main/cmake/php_config.h.in

@@ -523,7 +523,7 @@
 #cmakedefine PHP_BUILD_SYSTEM "@PHP_BUILD_SYSTEM@"
 
 /* Compiler identification string. */
-#cmakedefine PHP_COMPILER_ID "@PHP_COMPILER_ID@"
+#cmakedefine PHP_COMPILER_ID "@CMAKE_C_COMPILER_ID@"
 
 /* Define to 1 if the compiler supports AVX-512. */
 #cmakedefine PHP_HAVE_AVX512_SUPPORTS 1

cmake/win32/CMakeLists.txt

@@ -177,21 +177,26 @@ set_source_files_properties(
 
 # Determine major and minor linker version.
 block(PROPAGATE PHP_LINKER_MAJOR PHP_LINKER_MINOR)
-  if(CMAKE_C_COMPILER_LINKER_VERSION)
-    set(version "${CMAKE_C_COMPILER_LINKER_VERSION}")
-  else()
-    set(version "")
+  if(
+    NOT DEFINED CMAKE_C_COMPILER_LINKER_VERSION
+    OR NOT CMAKE_C_COMPILER_LINKER_VERSION MATCHES "^[^0-9]*[0-9]"
+  )
+    message(
+      FATAL_ERROR
+      "The linker version could not be detected. Please ensure the linker "
+      "version can be determined, or set the 'CMAKE_C_COMPILER_LINKER_VERSION' "
+      "variable to the linker version of format '<major>.<minor>'."
+    )
   endif()
 
-  string(REGEX MATCH "^([0-9]+)\\.?" _ "${version}")
+  string(REGEX MATCH "^[^0-9]*([0-9]+)\\.?" _ "${CMAKE_C_COMPILER_LINKER_VERSION}")
   set(PHP_LINKER_MAJOR "${CMAKE_MATCH_1}")
-  string(REGEX MATCH "^[0-9]+\\.([0-9]+)\\.?" _ "${version}")
-  set(PHP_LINKER_MINOR "${CMAKE_MATCH_1}")
-
   if(NOT PHP_LINKER_MAJOR)
     set(PHP_LINKER_MAJOR 0)
   endif()
 
+  string(REGEX MATCH "^[^0-9]*[0-9]+\\.([0-9]+)\\.?" _ "${CMAKE_C_COMPILER_LINKER_VERSION}")
+  set(PHP_LINKER_MINOR "${CMAKE_MATCH_1}")
   if(NOT PHP_LINKER_MINOR)
     set(PHP_LINKER_MINOR 0)
   endif()