Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/toolchains/template.cmake

@@ -101,15 +101,14 @@ set(PHP_ICONV_ERRNO_WORKS_EXITCODE 0)
 # ext/opcache
 ################################################################################
 
-# Set the exit code of SysV IPC shared memory check in opcache extension.
-set(HAVE_SHM_IPC_EXITCODE 0)
+# Set the exit code of SysV IPC shared memory check.
+set(PHP_EXT_OPCACHE_HAS_SHM_IPC_EXITCODE 0)
 
-# Set the exit code of the mmap() using MAP_ANON shared memory check in opcache
-# extension.
-set(HAVE_SHM_MMAP_ANON_EXITCODE 0)
+# Set the exit code of the mmap() using MAP_ANON shared memory check.
+set(PHP_EXT_OPCACHE_HAS_SHM_MMAP_ANON_EXITCODE 0)
 
-# Set the exit code of the shm_open() shared memory check in opcache extension.
-set(HAVE_SHM_MMAP_POSIX_EXITCODE 0)
+# Set the exit code of the shm_open() shared memory check.
+set(PHP_EXT_OPCACHE_HAS_SHM_MMAP_POSIX_EXITCODE 0)
 
 ################################################################################
 # ext/pcntl

cmake/ext/opcache/CMakeLists.txt

@@ -341,8 +341,5 @@ check_symbol_exists(shm_create_largepage sys/mman.h HAVE_SHM_CREATE_LARGEPAGE)
 
 # Check for shared memory support.
 include(cmake/CheckSHM.cmake)
-if(TARGET PHP::CheckSHMLibrary)
-  target_link_libraries(php_ext_opcache PRIVATE PHP::CheckSHMLibrary)
-endif()
 
 configure_file(cmake/config.h.in config.h)