Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/modules/FindACL.cmake

@@ -63,7 +63,7 @@ function(_acl_check result)
     endif()
 
     if(NOT ACL_USE_USER_GROUP)
-      check_symbol_exists(acl_free "sys/acl.h" _acl_successful)
+      check_symbol_exists(acl_free sys/acl.h _acl_successful)
     else()
       check_source_compiles(C [[
         #include <sys/acl.h>

cmake/cmake/modules/FindCrypt.cmake

@@ -78,7 +78,7 @@ endif()
 if(NOT DEFINED Crypt_IS_BUILT_IN)
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_QUIET TRUE)
-    check_symbol_exists(crypt "unistd.h" Crypt_IS_BUILT_IN)
+    check_symbol_exists(crypt unistd.h Crypt_IS_BUILT_IN)
   cmake_pop_check_state()
 endif()
 
@@ -122,7 +122,7 @@ else()
     set(CMAKE_REQUIRED_INCLUDES ${Crypt_INCLUDE_DIR})
     set(CMAKE_REQUIRED_LIBRARIES ${Crypt_LIBRARY})
     set(CMAKE_REQUIRED_QUIET TRUE)
-    check_symbol_exists(crypt "unistd.h" _Crypt_SANITY_CHECK)
+    check_symbol_exists(crypt unistd.h _Crypt_SANITY_CHECK)
   cmake_pop_check_state()
 
   mark_as_advanced(Crypt_INCLUDE_DIR Crypt_LIBRARY)

cmake/cmake/modules/FindNdbm.cmake

@@ -58,7 +58,7 @@ endif()
 if(NOT DEFINED Ndbm_IS_BUILT_IN)
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_QUIET TRUE)
-    check_symbol_exists(dbm_open "ndbm.h" Ndbm_IS_BUILT_IN)
+    check_symbol_exists(dbm_open ndbm.h Ndbm_IS_BUILT_IN)
   cmake_pop_check_state()
 endif()
 

cmake/cmake/modules/PHP/CheckFopencookie.cmake

@@ -37,7 +37,7 @@ include(CMakePushCheckState)
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-  check_symbol_exists(fopencookie "stdio.h" _HAVE_FOPENCOOKIE)
+  check_symbol_exists(fopencookie stdio.h _HAVE_FOPENCOOKIE)
 cmake_pop_check_state()
 
 if(NOT _HAVE_FOPENCOOKIE)

cmake/cmake/modules/PHP/CheckSysMacros.cmake

@@ -93,10 +93,10 @@ block()
   endif()
 
   if(HAVE_SYS_MKDEV_H)
-    check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV)
+    check_symbol_exists(major sys/mkdev.h MAJOR_IN_MKDEV)
     list(APPEND headers "sys/mkdev.h")
   elseif(HAVE_SYS_SYSMACROS_H)
-    check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS)
+    check_symbol_exists(major sys/sysmacros.h MAJOR_IN_SYSMACROS)
     list(APPEND headers "sys/sysmacros.h")
   endif()
 

cmake/ext/iconv/CMakeLists.txt

@@ -94,11 +94,11 @@ if(TARGET Iconv::Iconv)
   # Sanity and library type checks.
   if(Iconv_IS_BUILT_IN)
     # When iconv is built into C library, first check if iconv function exists.
-    check_symbol_exists(iconv "iconv.h" _HAVE_ICONV)
+    check_symbol_exists(iconv iconv.h _HAVE_ICONV)
 
     # And if not, then check for libiconv function.
     if(NOT _HAVE_ICONV)
-      check_symbol_exists(libiconv "iconv.h" HAVE_LIBICONV)
+      check_symbol_exists(libiconv iconv.h HAVE_LIBICONV)
     endif()
   else()
     check_library_exists(Iconv::Iconv libiconv "" HAVE_LIBICONV)
@@ -124,7 +124,7 @@ if(TARGET Iconv::Iconv)
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_LIBRARIES Iconv::Iconv)
     set(CMAKE_REQUIRED_QUIET TRUE)
-    check_symbol_exists(_libiconv_version "iconv.h" _have_gnu_libiconv)
+    check_symbol_exists(_libiconv_version iconv.h _have_gnu_libiconv)
   cmake_pop_check_state()
   if(_have_gnu_libiconv)
     message(CHECK_PASS "GNU libiconv")

cmake/ext/mbstring/libmbfl/CMakeLists.txt

@@ -102,7 +102,7 @@ target_compile_definitions(
 
 # The libmbfl configuration header.
 check_include_files(strings.h HAVE_STRINGS_H)
-check_symbol_exists(strcasecmp "strings.h" HAVE_STRCASECMP)
+check_symbol_exists(strcasecmp strings.h HAVE_STRCASECMP)
 
 cmake_path(
   RELATIVE_PATH

cmake/ext/opcache/CMakeLists.txt

@@ -327,7 +327,7 @@ add_feature_info(
 # Configuration checks.
 ################################################################################
 
-check_symbol_exists(mprotect "sys/mman.h" HAVE_MPROTECT)
+check_symbol_exists(mprotect sys/mman.h HAVE_MPROTECT)
 
 # For FreeBSD.
 check_symbol_exists(shm_create_largepage "sys/mman.h" HAVE_SHM_CREATE_LARGEPAGE)

cmake/ext/openssl/CMakeLists.txt

@@ -176,7 +176,7 @@ target_link_libraries(php_ext_openssl PUBLIC OpenSSL::SSL)
 if(TARGET OpenSSL::SSL)
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_LIBRARIES OpenSSL::SSL)
-    check_symbol_exists(RAND_egd "openssl/rand.h" HAVE_RAND_EGD)
+    check_symbol_exists(RAND_egd openssl/rand.h HAVE_RAND_EGD)
   cmake_pop_check_state()
 
   if(OPENSSL_VERSION VERSION_LESS 3 AND PHP_EXT_OPENSSL_LEGACY_PROVIDER)

cmake/ext/random/CMakeLists.txt

@@ -50,8 +50,8 @@ target_sources(
 
 target_compile_definitions(php_ext_random PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE)
 
-check_symbol_exists(arc4random_buf "stdlib.h" HAVE_ARC4RANDOM_BUF)
-check_symbol_exists(getrandom "sys/random.h" HAVE_GETRANDOM)
+check_symbol_exists(arc4random_buf stdlib.h HAVE_ARC4RANDOM_BUF)
+check_symbol_exists(getrandom sys/random.h HAVE_GETRANDOM)
 
 # Check for CCRandomGenerateBytes. Header was absent in previous macOS releases.
 block()