Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/toolchains/template.cmake

@@ -131,9 +131,9 @@ set(HAVE_SCHED_GETCPU_EXITCODE 0)
 # ext/pcre
 ################################################################################
 
-# Set the exit code for the check whether the bundled PCRE library has JIT
-# supported on the target architecture.
-set(HAVE_PCRE_JIT_SUPPORT_EXITCODE 0)
+# Set the exit code of the check when using an external PCRE library whether JIT
+# support is available for the target architecture.
+set(PHP_EXT_PCRE_HAS_JIT_EXITCODE 0)
 
 ################################################################################
 # ext/posix

cmake/ext/pcre/CMakeLists.txt

@@ -70,17 +70,13 @@ target_sources(
   php_ext_pcre
   PRIVATE
     php_pcre.c
-    php_pcre.def
     php_pcre.stub.php
   PUBLIC
     FILE_SET HEADERS
       FILES
         php_pcre.h
 )
 
-# TODO: Fix this better for OBJECT libraries, which can't handle .def files.
-set_source_files_properties(php_pcre.def PROPERTIES HEADER_FILE_ONLY TRUE)
-
 target_compile_definitions(php_ext_pcre PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 
 set(PCRE2_CODE_UNIT_WIDTH 8)
@@ -100,13 +96,13 @@ if(PHP_EXT_PCRE_EXTERNAL)
     message(CHECK_START "Checking for PCRE JIT support")
 
     if(
-      NOT DEFINED HAVE_PCRE_JIT_SUPPORT_EXITCODE
+      NOT DEFINED PHP_EXT_PCRE_HAS_JIT_EXITCODE
       AND CMAKE_CROSSCOMPILING
       AND NOT CMAKE_CROSSCOMPILING_EMULATOR
       AND CMAKE_SYSTEM_PROCESSOR MATCHES
         "^(arm.*|i[34567]86|x86_64|amd64|mips.*|powerpc.*|sparc.*|X86|AMD64|ARM64)$"
     )
-      set(HAVE_PCRE_JIT_SUPPORT_EXITCODE 0)
+      set(PHP_EXT_PCRE_HAS_JIT_EXITCODE 0)
     endif()
 
     cmake_push_check_state(RESET)
@@ -129,10 +125,11 @@ if(PHP_EXT_PCRE_EXTERNAL)
 
           return !have_jit;
         }
-      ]] HAVE_PCRE_JIT_SUPPORT)
+      ]] PHP_EXT_PCRE_HAS_JIT)
     cmake_pop_check_state()
 
-    if(HAVE_PCRE_JIT_SUPPORT)
+    if(PHP_EXT_PCRE_HAS_JIT)
+      set(HAVE_PCRE_JIT_SUPPORT TRUE)
       message(CHECK_PASS "yes")
     else()
       message(CHECK_FAIL "no")
@@ -210,6 +207,10 @@ else()
 
   if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(PCRE2_STATIC TRUE)
+
+    if(TARGET php_sapi)
+      target_sources(php_sapi INTERFACE php_pcre.def)
+    endif()
   endif()
 
   target_compile_definitions(

docs/cmake/configuration.md

@@ -2475,7 +2475,7 @@ A list of Autoconf `configure` command-line configuration options, Windows
       <td></td>
     </tr>
     <tr>
-      <td>&emsp;--without-external-pcre</td>
+      <td>--without-external-pcre</td>
       <td>N/A</td>
       <td>PHP_EXT_PCRE_EXTERNAL=OFF</td>
       <td>default</td>