Merge branch 'PHP-8.4'

Author: petk

cmake/Zend/CMakeLists.txt

@@ -78,7 +78,7 @@ mark_as_advanced(ZEND_MAX_EXECUTION_TIMERS)
 # Add library.
 ################################################################################
 
-add_library(zend STATIC)
+add_library(zend OBJECT)
 add_library(Zend::Zend ALIAS zend)
 
 file(GLOB _zend_headers ${CMAKE_CURRENT_SOURCE_DIR}/*.h)

cmake/main/CMakeLists.txt

@@ -125,7 +125,6 @@ target_link_libraries(
   # Link publicly for PHP SAPIs.
   PUBLIC
     PHP::configuration
-    Zend::Zend
 )
 
 if(TARGET PHP::win32)

cmake/sapi/apache2handler/CMakeLists.txt

@@ -88,6 +88,7 @@ target_link_libraries(
   php_apache2handler
   PRIVATE
     PHP::main
+    Zend::Zend
     Apache::Apache
 )
 

cmake/sapi/cgi/CMakeLists.txt

@@ -28,6 +28,7 @@ target_link_libraries(
   php_cgi
   PRIVATE
     PHP::main
+    Zend::Zend
     $<$<PLATFORM_ID:Windows>:ws2_32;kernel32;advapi32>
 )
 

cmake/sapi/cli/CMakeLists.txt

@@ -82,6 +82,7 @@ target_link_libraries(
   php_cli
   PRIVATE
     PHP::main
+    Zend::Zend
     $<$<PLATFORM_ID:Windows>:ws2_32;shell32>
 )
 
@@ -132,6 +133,7 @@ if(SAPI_CLI_WIN_NO_CONSOLE)
     php_cli_win_no_console
     PRIVATE
       PHP::main
+      Zend::Zend
       shell32
   )
 

cmake/sapi/embed/CMakeLists.txt

@@ -29,7 +29,12 @@ target_sources(
         php_embed.h
 )
 
-target_link_libraries(php_embed PRIVATE PHP::main)
+target_link_libraries(
+  php_embed
+  PRIVATE
+    PHP::main
+    Zend::Zend
+)
 
 target_compile_definitions(php_embed PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 

cmake/sapi/fpm/CMakeLists.txt

@@ -153,7 +153,12 @@ target_include_directories(
 
 target_compile_definitions(php_fpm PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
-target_link_libraries(php_fpm PRIVATE PHP::main)
+target_link_libraries(
+  php_fpm
+  PRIVATE
+    PHP::main
+    Zend::Zend
+)
 
 set_target_properties(
   php_fpm

cmake/sapi/fuzzer/CMakeLists.txt

@@ -118,6 +118,11 @@ set_target_properties(
     OUTPUT_NAME ${PHP_PROGRAM_PREFIX}fuzzer${PHP_PROGRAM_SUFFIX}
 )
 
-target_link_libraries(php_fuzzer PRIVATE PHP::main)
+target_link_libraries(
+  php_fuzzer
+  PRIVATE
+    PHP::main
+    Zend::Zend
+)
 
 install(TARGETS php_fuzzer RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

cmake/sapi/litespeed/CMakeLists.txt

@@ -27,7 +27,12 @@ add_executable(php_litespeed
   lsapilib.c
 )
 
-target_link_libraries(php_litespeed PRIVATE PHP::main)
+target_link_libraries(
+  php_litespeed
+  PRIVATE
+    PHP::main
+    Zend::Zend
+)
 
 set_target_properties(
   php_litespeed

cmake/sapi/phpdbg/CMakeLists.txt

@@ -95,6 +95,7 @@ target_link_libraries(
   php_phpdbg
   PRIVATE
     PHP::main
+    Zend::Zend
     $<$<PLATFORM_ID:Windows>:ws2_32;user32>
 )
 
@@ -176,7 +177,8 @@ if(SAPI_PHPDBG_SHARED)
     php_phpdbg_shared
     PRIVATE
       # TODO: fix this better in the future (building with -fPIC etc).
-      #PHP::main
+      PHP::main
+      Zend::Zend
       $<$<PLATFORM_ID:Windows>:ws2_32;user32>
   )
 endif()