Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/modules/PHP/Re2c.cmake

@@ -197,7 +197,7 @@ macro(_php_re2c_config)
 
   # If re2c is not found on the system, set which version to download.
   if(NOT PHP_RE2C_VERSION_DOWNLOAD)
-    set(PHP_RE2C_VERSION_DOWNLOAD 4.0.2)
+    set(PHP_RE2C_VERSION_DOWNLOAD 4.2)
   endif()
 endmacro()
 
@@ -637,6 +637,10 @@ function(_php_re2c_download)
     )
   endif()
 
+  if(RE2C_VERSION VERSION_GREATER_EQUAL 4.2)
+    list(APPEND re2cOptions -DRE2C_BUILD_RE2SWIFT=OFF)
+  endif()
+
   ExternalProject_Add(
     re2c
     URL

cmake/main/CMakeLists.txt

@@ -389,6 +389,12 @@ function(_php_main_configure_php_config)
   file(READ ${CMAKE_CURRENT_BINARY_DIR}/Zend/CMakeFiles/zend_config.h config)
   string(STRIP "${config}" ZEND_CONFIGURATION)
 
+  # Add Windows configuration.
+  if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    file(READ ${CMAKE_CURRENT_BINARY_DIR}/win32/config.h config)
+    string(STRIP "${config}" WINDOWS_CONFIGURATION)
+  endif()
+
   file(READ main/cmake/php_config.h.in content)
   string(CONFIGURE "${content}" content @ONLY)
   file(

cmake/main/cmake/php_config.h.in

@@ -584,12 +584,6 @@
 /* Define to 1 you have IRIX-style reentrant time functions. */
 #cmakedefine PHP_IRIX_TIME_R 1
 
-/* Linker major version. */
-#cmakedefine PHP_LINKER_MAJOR @PHP_LINKER_MAJOR@
-
-/* Linker minor version. */
-#cmakedefine PHP_LINKER_MINOR @PHP_LINKER_MINOR@
-
 /* The 'uname' output. */
 #define PHP_OS "@CMAKE_SYSTEM_NAME@"
 
@@ -663,6 +657,7 @@
 @ZEND_CONFIGURATION@
 
 #if @PHP_CONFIG_H_WINDOWS@
+@WINDOWS_CONFIGURATION@
 # include "build-defs.h"
 # if __has_include("main/config.pickle.h")
 #  include "main/config.pickle.h"

cmake/win32/CMakeLists.txt

@@ -152,6 +152,34 @@ set_source_files_properties(
     HEADER_FILE_ONLY ON
 )
 
+################################################################################
+# Configure configuration header.
+################################################################################
+
+# 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 "")
+  endif()
+
+  string(REGEX MATCH "^([0-9]+)\\.?" _ "${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()
+
+  if(NOT PHP_LINKER_MINOR)
+    set(PHP_LINKER_MINOR 0)
+  endif()
+endblock()
+
+configure_file(cmake/config.h.in config.h @ONLY)
+
 ################################################################################
 # Configure installation.
 ################################################################################

cmake/win32/cmake/config.h.in

@@ -0,0 +1,5 @@
+/* Linker major version. */
+#cmakedefine PHP_LINKER_MAJOR @PHP_LINKER_MAJOR@
+
+/* Linker minor version. */
+#cmakedefine PHP_LINKER_MINOR @PHP_LINKER_MINOR@