Merge branch 'PHP-8.3' into PHP-8.4

petk · petk · commit 229afe1af0fe · 2025-08-07T00:39:58.000+02:00
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -80,8 +80,8 @@ define_property(
 # Check whether IPO/LTO can be enabled.
 include(PHP/Optimization)
 
-# Set CMAKE_POSITION_INDEPENDENT_CODE.
-include(PHP/PositionIndependentCode)
+include(CheckPIESupported)
+check_pie_supported()
 
 # Configure build types.
 include(cmake/BuildTypes.cmake)
diff --git a/cmake/cmake/CMakeDefaults.cmake b/cmake/cmake/CMakeDefaults.cmake
@@ -47,3 +47,8 @@ mark_as_advanced(CMAKE_COMPILE_WARNING_AS_ERROR)
 # Set default visibility of all symbols to hidden if the compiler (for example,
 # GCC >= 4) supports it. This can help reduce the binary size and startup time.
 set(CMAKE_C_VISIBILITY_PRESET "hidden")
+
+# Enable position-independent code (PIC) for all targets.
+if(NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
+  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+endif()
diff --git a/cmake/cmake/modules/PHP/PositionIndependentCode.cmake b/cmake/cmake/modules/PHP/PositionIndependentCode.cmake
diff --git a/cmake/ext/standard/CMakeLists.txt b/cmake/ext/standard/CMakeLists.txt
@@ -484,7 +484,6 @@ set_target_properties(
   PROPERTIES
     INCLUDE_DIRECTORIES $<TARGET_PROPERTY:php_ext_standard,INCLUDE_DIRECTORIES>
     COMPILE_DEFINITIONS $<TARGET_PROPERTY:php_ext_standard,COMPILE_DEFINITIONS>
-    LINK_LIBRARIES $<TARGET_PROPERTY:php_ext_standard,LINK_LIBRARIES>
 )
 
 target_compile_definitions(

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,6 @@ set_target_properties(`
`484`	`484`	`PROPERTIES`
`485`	`485`	`INCLUDE_DIRECTORIES $<TARGET_PROPERTY:php_ext_standard,INCLUDE_DIRECTORIES>`
`486`	`486`	`COMPILE_DEFINITIONS $<TARGET_PROPERTY:php_ext_standard,COMPILE_DEFINITIONS>`
`487`		`- LINK_LIBRARIES $<TARGET_PROPERTY:php_ext_standard,LINK_LIBRARIES>`
`488`	`487`	`)`
`489`	`488`
`490`	`489`	`target_compile_definitions(`