Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -252,7 +252,6 @@ include(PHP/CheckAVX512)
 ################################################################################
 
 check_symbol_exists(alphasort "dirent.h" HAVE_ALPHASORT)
-check_symbol_exists(chroot "unistd.h" HAVE_CHROOT)
 check_symbol_exists(explicit_memset "string.h" HAVE_EXPLICIT_MEMSET)
 check_symbol_exists(fdatasync "unistd.h" HAVE_FDATASYNC)
 # The fdatasync declaration on macOS is missing in headers, yet is in C library.

cmake/ext/standard/CMakeLists.txt

@@ -68,15 +68,13 @@ target_sources(
     array.c
     assert.c
     base64.c
-    basic_functions.c
     basic_functions.stub.php
     browscap.c
     crc32.c
     credits.c
     crypt.c
     css.c
     datetime.c
-    dir.c
     dir.stub.php
     dl.c
     dl.stub.php
@@ -525,8 +523,55 @@ block()
   add_dependencies(php_standard php_standard_credits)
 endblock()
 
-# TODO: Check whether to enable the chroot() function by checking which SAPI is
-# being built.
-set(ENABLE_CHROOT_FUNC TRUE)
+################################################################################
+# Add chroot() based on the SAPI type. It should be enabled only for the
+# CLI-based SAPIs. This enables building all SAPIs in a single build invocation.
+# Here, a build-time solution is integrated, although this would be better
+# resolved as mentioned in the issue report.
+# See: https://github.com/php/php-src/issues/11984
+################################################################################
+
+check_symbol_exists(chroot "unistd.h" HAVE_CHROOT)
+
+add_library(php_standard_functions_cli OBJECT)
+add_library(php_standard_functions OBJECT)
+
+target_sources(php_standard_functions_cli PRIVATE basic_functions.c dir.c)
+target_sources(php_standard_functions PRIVATE basic_functions.c dir.c)
+
+target_compile_definitions(php_standard_functions_cli PRIVATE )
+
+target_include_directories(
+  php_standard_functions_cli
+  PRIVATE
+    $<TARGET_PROPERTY:php_standard,INCLUDE_DIRECTORIES>
+)
+target_include_directories(
+  php_standard_functions
+  PRIVATE
+    $<TARGET_PROPERTY:php_standard,INCLUDE_DIRECTORIES>
+)
+target_compile_definitions(
+  php_standard_functions_cli
+  PRIVATE
+    $<TARGET_PROPERTY:php_standard,COMPILE_DEFINITIONS>
+    ENABLE_CHROOT_FUNC
+)
+target_compile_definitions(
+  php_standard_functions
+  PRIVATE $<TARGET_PROPERTY:php_standard,COMPILE_DEFINITIONS>
+)
+target_link_libraries(
+  php_standard_functions_cli
+  PRIVATE $<TARGET_PROPERTY:php_standard,LINK_LIBRARIES>
+)
+target_link_libraries(
+  php_standard_functions
+  PRIVATE $<TARGET_PROPERTY:php_standard,LINK_LIBRARIES>
+)
+
+################################################################################
+# Configuration header
+################################################################################
 
 configure_file(config.cmake.h.in config.h)

cmake/ext/standard/config.cmake.h.in

@@ -7,15 +7,15 @@
 /* Define to 1 if crypt_r uses struct crypt_data. */
 #cmakedefine CRYPT_R_STRUCT_CRYPT_DATA 1
 
-/* Define to 1 to enable the 'chroot' function. */
-#cmakedefine ENABLE_CHROOT_FUNC 1
-
 /* Define to 1 when aarch64 CRC32 API is available. */
 #cmakedefine HAVE_AARCH64_CRC32 1
 
 /* Define to 1 if the system has the 'libargon2' library. */
 #cmakedefine HAVE_ARGON2LIB 1
 
+/* Define to 1 if you have the 'chroot' function. */
+#cmakedefine HAVE_CHROOT 1
+
 /* Define to 1 if you have the 'elf_aux_info' function. */
 #cmakedefine HAVE_ELF_AUX_INFO 1
 

cmake/main/CMakeLists.txt

@@ -216,6 +216,9 @@ target_sources(
     $<$<AND:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,STATIC_LIBRARY>,$<STREQUAL:$<TARGET_PROPERTY:Zend::Zend,TYPE>,STATIC_LIBRARY>>:$<TARGET_OBJECTS:Zend::Zend>>
 
     $<$<TARGET_EXISTS:PHP::windows>:$<TARGET_OBJECTS:PHP::windows>>
+
+    # ext/standard functions objects based on the SAPI type.
+    $<IF:$<BOOL:$<TARGET_PROPERTY:PHP_SAPI_CLI>>,$<TARGET_OBJECTS:php_standard_functions_cli>,$<TARGET_OBJECTS:php_standard_functions>>
 )
 
 ################################################################################

cmake/main/php_config.cmake.h.in

@@ -81,9 +81,6 @@
 /* Define to 1 if PHP has the <main/build-defs.h> header file. */
 #cmakedefine HAVE_BUILD_DEFS_H 1
 
-/* Define to 1 if you have the 'chroot' function. */
-#cmakedefine HAVE_CHROOT 1
-
 /* Define to 1 if you have the 'copy_file_range' function. */
 #cmakedefine HAVE_COPY_FILE_RANGE 1
 

docs/cmake/differences.md

@@ -126,3 +126,6 @@ build system:
 
 * Zend/zend_vm_gen.php deprecation warnings on 32-bit systems.
   See: https://github.com/php/php-src/issues/15899
+
+* The `chroot()` PHP function is enabled/disabled based on the SAPI type:
+  See: https://github.com/php/php-src/issues/11984