Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/modules/PHP/PositionIndependentCode.cmake

@@ -1,18 +1,24 @@
 #[=============================================================================[
 # PHP/PositionIndependentCode
 
-Wrapper module for CMake's `CheckPIESupported` module and
-`CMAKE_POSITION_INDEPENDENT_CODE` variable.
+This module wraps the
+[CheckPIESupported](https://cmake.org/cmake/help/latest/module/CheckPIESupported.html)
+module and sets the `CMAKE_POSITION_INDEPENDENT_CODE` variable.
 
-This module checks whether to enable the `POSITION_INDEPENDENT_CODE` target
-property for all targets globally. The SHARED and MODULE targets have PIC always
-enabled by default regardless of this module.
+With this module, the position-independent code (PIC) and position-independent
+executable (PIE) compile-time and link-time options are globally enabled for all
+targets. This enables building shared apache2handler, embed, and phpdbg SAPI
+libraries without duplicating builds or targets for executables, static and
+shared libraries.
 
-Position independent code (PIC) and position independent executable (PIE)
-compile-time and link-time options are for now unconditionally added globally to
-all targets, to be able to build shared apache2handler, embed, and phpdbg SAPI
-libraries. This probably could be fine tuned in the future further but it can
-exponentially complicate the build system code or the build usability.
+While finer control over PIC/PIE settings may be possible, doing so
+significantly increases build system complexity (two types of library and
+extension objects should be built - ones with PIC enabled and those with PIC
+disabled - which increases build time) or reduce usability (doing two builds
+- one for executable and static SAPIs and one for shared SAPIs).
+
+SHARED and MODULE targets always have PIC enabled by default, regardless of
+this module.
 
 ## Usage
 
@@ -24,38 +30,11 @@ include(PHP/PositionIndependentCode)
 
 include_guard(GLOBAL)
 
-block()
-  include(CheckPIESupported)
-
-  message(CHECK_START "Checking if linker supports PIE")
-
-  check_pie_supported(OUTPUT_VARIABLE output)
-
-  if(CMAKE_C_LINK_PIE_SUPPORTED)
-    message(CHECK_PASS "yes")
-  else()
-    message(CHECK_FAIL "no")
-
-    if(
-      CMAKE_VERSION VERSION_GREATER_EQUAL 3.26
-      AND NOT DEFINED _PHP_POSITION_INDEPENDENT_CODE_LOGGED
-    )
-      message(
-        CONFIGURE_LOG
-        "Position independent executable (PIE) is not supported at link time:\n"
-        "${output}"
-        "PIE link options will not be passed to linker."
-      )
+include(CheckPIESupported)
 
-      set(
-        _PHP_POSITION_INDEPENDENT_CODE_LOGGED
-        TRUE
-        CACHE INTERNAL
-        "Internal marker whether PIE check has been logged."
-      )
-    endif()
-  endif()
-endblock()
+message(CHECK_START "Detecting linker PIE support")
+check_pie_supported()
+message(CHECK_PASS "done")
 
 if(NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
   set(CMAKE_POSITION_INDEPENDENT_CODE ON)

docs/cmake/modules/PHP/PositionIndependentCode.md

@@ -3,18 +3,24 @@
 
 # PHP/PositionIndependentCode
 
-Wrapper module for CMake's `CheckPIESupported` module and
-`CMAKE_POSITION_INDEPENDENT_CODE` variable.
+This module wraps the
+[CheckPIESupported](https://cmake.org/cmake/help/latest/module/CheckPIESupported.html)
+module and sets the `CMAKE_POSITION_INDEPENDENT_CODE` variable.
 
-This module checks whether to enable the `POSITION_INDEPENDENT_CODE` target
-property for all targets globally. The SHARED and MODULE targets have PIC always
-enabled by default regardless of this module.
+With this module, the position-independent code (PIC) and position-independent
+executable (PIE) compile-time and link-time options are globally enabled for all
+targets. This enables building shared apache2handler, embed, and phpdbg SAPI
+libraries without duplicating builds or targets for executables, static and
+shared libraries.
 
-Position independent code (PIC) and position independent executable (PIE)
-compile-time and link-time options are for now unconditionally added globally to
-all targets, to be able to build shared apache2handler, embed, and phpdbg SAPI
-libraries. This probably could be fine tuned in the future further but it can
-exponentially complicate the build system code or the build usability.
+While finer control over PIC/PIE settings may be possible, doing so
+significantly increases build system complexity (two types of library and
+extension objects should be built - ones with PIC enabled and those with PIC
+disabled - which increases build time) or reduce usability (doing two builds
+- one for executable and static SAPIs and one for shared SAPIs).
+
+SHARED and MODULE targets always have PIC enabled by default, regardless of
+this module.
 
 ## Usage