Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/modules/FindAppArmor.cmake

@@ -27,7 +27,8 @@ find_package(AppArmor)
 ```
 #]=============================================================================]
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
+include(CMakePushCheckState)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
 
@@ -69,16 +70,17 @@ if(NOT AppArmor_LIBRARY)
 endif()
 
 # Sanity check.
-if(AppArmor_LIBRARY)
-  check_library_exists(
-    "${AppArmor_LIBRARY}"
-    aa_change_profile
-    ""
-    _apparmor_sanity_check
-  )
+if(AppArmor_INCLUDE_DIR AND AppArmor_LIBRARY)
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_INCLUDES ${AppArmor_INCLUDE_DIR})
+    set(CMAKE_REQUIRED_LIBRARIES ${AppArmor_LIBRARY})
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
+    check_symbol_exists(aa_change_profile sys/apparmor.h _AppArmor_SANITY_CHECK)
+  cmake_pop_check_state()
 endif()
 
-if(NOT _apparmor_sanity_check)
+if(NOT _AppArmor_SANITY_CHECK)
   string(APPEND _reason "Sanity check failed: aa_change_profile not found. ")
 endif()
 
@@ -97,7 +99,7 @@ find_package_handle_standard_args(
   REQUIRED_VARS
     AppArmor_LIBRARY
     AppArmor_INCLUDE_DIR
-    _apparmor_sanity_check
+    _AppArmor_SANITY_CHECK
   VERSION_VAR AppArmor_VERSION
   HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"

cmake/cmake/modules/FindEditline.cmake

@@ -27,7 +27,8 @@ find_package(Editline)
 ```
 #]=============================================================================]
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
+include(CMakePushCheckState)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
 
@@ -69,15 +70,16 @@ if(NOT Editline_LIBRARY)
 endif()
 
 # Sanity check.
-if(Editline_LIBRARY)
-  check_library_exists(
-    "${Editline_LIBRARY}"
-    readline
-    ""
-    _editline_sanity_check
-  )
+if(Editline_INCLUDE_DIR AND Editline_LIBRARY)
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_INCLUDES ${Editline_INCLUDE_DIR})
+    set(CMAKE_REQUIRED_LIBRARIES ${Editline_LIBRARY})
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
+    check_symbol_exists(readline editline/readline.h _Editline_SANITY_CHECK)
+  cmake_pop_check_state()
 
-  if(NOT _editline_sanity_check)
+  if(NOT _Editline_SANITY_CHECK)
     string(APPEND _reason "Sanity check failed: readline() not found. ")
   endif()
 endif()
@@ -97,7 +99,7 @@ find_package_handle_standard_args(
   REQUIRED_VARS
     Editline_LIBRARY
     Editline_INCLUDE_DIR
-    _editline_sanity_check
+    _Editline_SANITY_CHECK
   VERSION_VAR Editline_VERSION
   HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"

cmake/cmake/modules/FindNetSnmp.cmake

@@ -28,7 +28,8 @@ find_package(NetSnmp)
 ```
 #]=============================================================================]
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
+include(CMakePushCheckState)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
 
@@ -161,10 +162,20 @@ block(PROPAGATE NetSnmp_VERSION)
 endblock()
 
 # Sanity check.
-if(NetSnmp_LIBRARY)
-  check_library_exists("${NetSnmp_LIBRARY}" init_snmp "" _netsnmp_sanity_check)
+if(NetSnmp_INCLUDE_DIR AND NetSnmp_LIBRARY)
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_INCLUDES ${NetSnmp_INCLUDE_DIR})
+    set(CMAKE_REQUIRED_LIBRARIES ${NetSnmp_LIBRARY})
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
+    check_symbol_exists(
+      init_snmp
+      "net-snmp/net-snmp-config.h;net-snmp/net-snmp-includes.h"
+      _NetSnmp_SANITY_CHECK
+    )
+  cmake_pop_check_state()
 
-  if(NOT _netsnmp_sanity_check)
+  if(NOT _NetSnmp_SANITY_CHECK)
     string(APPEND _reason "Sanity check failed: init_snmp not found. ")
   endif()
 endif()
@@ -176,7 +187,7 @@ find_package_handle_standard_args(
   REQUIRED_VARS
     NetSnmp_LIBRARY
     NetSnmp_INCLUDE_DIR
-    _netsnmp_sanity_check
+    _NetSnmp_SANITY_CHECK
   VERSION_VAR NetSnmp_VERSION
   HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"

cmake/cmake/modules/FindSELinux.cmake

@@ -27,7 +27,8 @@ find_package(SELinux)
 ```
 #]=============================================================================]
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
+include(CMakePushCheckState)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
 
@@ -69,15 +70,20 @@ if(NOT SELinux_LIBRARY)
 endif()
 
 # Sanity check.
-if(SELinux_LIBRARY)
-  check_library_exists(
-    "${SELinux_LIBRARY}"
-    security_setenforce
-    ""
-    _selinux_sanity_check
-  )
-
-  if(NOT _selinux_sanity_check)
+if(SELinux_INCLUDE_DIR AND SELinux_LIBRARY)
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_INCLUDES ${SELinux_INCLUDE_DIR})
+    set(CMAKE_REQUIRED_LIBRARIES ${SELinux_LIBRARY})
+    set(CMAKE_REQUIRED_QUIET TRUE)
+
+    check_symbol_exists(
+      security_setenforce
+      selinux/selinux.h
+      _SELinux_SANITY_CHECK
+    )
+  cmake_pop_check_state()
+
+  if(NOT _SELinux_SANITY_CHECK)
     string(APPEND _reason "Sanity check failed: security_setenforce() not found. ")
   endif()
 endif()
@@ -94,7 +100,7 @@ find_package_handle_standard_args(
   REQUIRED_VARS
     SELinux_LIBRARY
     SELinux_INCLUDE_DIR
-    _selinux_sanity_check
+    _SELinux_SANITY_CHECK
   VERSION_VAR SELinux_VERSION
   HANDLE_VERSION_RANGE
   REASON_FAILURE_MESSAGE "${_reason}"

cmake/cmake/modules/Findlibzip.cmake

@@ -34,7 +34,7 @@ find_package(libzip)
 ```
 #]=============================================================================]
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
 include(CMakePushCheckState)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
@@ -96,18 +96,15 @@ block(PROPAGATE libzip_VERSION)
     set(libzip_VERSION ${PC_libzip_VERSION})
   endif()
 
-  # Guess older version.
-  if(NOT libzip_VERSION AND libzip_LIBRARY)
+  # Determine libzip older version heuristically.
+  if(NOT libzip_VERSION AND libzip_INCLUDE_DIR AND libzip_LIBRARY)
     cmake_push_check_state(RESET)
+      set(CMAKE_REQUIRED_INCLUDES ${libzip_INCLUDE_DIR})
+      set(CMAKE_REQUIRED_LIBRARIES ${libzip_LIBRARY})
       set(CMAKE_REQUIRED_QUIET TRUE)
 
       # zip_file_set_mtime is available with libzip 1.0.0.
-      check_library_exists(
-        "${libzip_LIBRARY}"
-        zip_file_set_mtime
-        ""
-        HAVE_SET_MTIME
-      )
+      check_symbol_exists(zip_file_set_mtime zip.h HAVE_SET_MTIME)
 
       if(NOT HAVE_SET_MTIME)
         set(libzip_VERSION 0.11)
@@ -116,24 +113,14 @@ block(PROPAGATE libzip_VERSION)
       endif()
 
       # zip_file_set_encryption is available in libzip 1.2.0.
-      check_library_exists(
-        "${libzip_LIBRARY}"
-        zip_file_set_encryption
-        ""
-        HAVE_ENCRYPTION
-      )
+      check_symbol_exists(zip_file_set_encryption zip.h HAVE_ENCRYPTION)
 
       if(HAVE_ENCRYPTION)
         set(libzip_VERSION 1.2.0)
       endif()
 
       # zip_libzip_version is available in libzip 1.3.1.
-      check_library_exists(
-        "${libzip_LIBRARY}"
-        zip_libzip_version
-        ""
-        HAVE_LIBZIP_VERSION
-      )
+      check_symbol_exists(zip_libzip_version zip.h HAVE_LIBZIP_VERSION)
 
       if(HAVE_LIBZIP_VERSION)
         set(libzip_VERSION 1.3.1)

cmake/ext/iconv/CMakeLists.txt

@@ -28,7 +28,6 @@ project(
   LANGUAGES C
 )
 
-include(CheckLibraryExists)
 include(CheckSourceRuns)
 include(CheckSymbolExists)
 include(CMakeDependentOption)
@@ -66,7 +65,7 @@ target_sources(
   PRIVATE
     iconv.c
     iconv.stub.php
-    php_iconv.def
+    $<$<AND:$<PLATFORM_ID:Windows>,$<NOT:$<IN_LIST:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY;SHARED_LIBRARY>>>:php_iconv.def>
   PUBLIC
     FILE_SET HEADERS
       FILES
@@ -94,27 +93,31 @@ 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 _PHP_HAVE_ICONV)
 
     # And if not, then check for libiconv function.
-    if(NOT _HAVE_ICONV)
+    if(NOT _PHP_HAVE_ICONV)
       check_symbol_exists(libiconv iconv.h HAVE_LIBICONV)
     endif()
   else()
-    check_library_exists(Iconv::Iconv libiconv "" HAVE_LIBICONV)
+    cmake_push_check_state(RESET)
+      set(CMAKE_REQUIRED_LIBRARIES Iconv::Iconv)
 
-    if(HAVE_LIBICONV)
-      set(ICONV_ALIASED_LIBICONV TRUE)
-    else()
-      check_library_exists(Iconv::Iconv iconv "" _HAVE_ICONV)
-    endif()
+      check_symbol_exists(libiconv iconv.h HAVE_LIBICONV)
+
+      if(HAVE_LIBICONV)
+        set(ICONV_ALIASED_LIBICONV TRUE)
+      else()
+        check_symbol_exists(iconv iconv.h _PHP_HAVE_ICONV)
+      endif()
+    cmake_pop_check_state()
   endif()
 
-  if(NOT _HAVE_ICONV AND NOT HAVE_LIBICONV)
+  if(NOT _PHP_HAVE_ICONV AND NOT HAVE_LIBICONV)
     message(
       FATAL_ERROR
-      "Iconv sanity check failed: neither 'iconv()' nor 'libiconv()' function "
-      "could be found."
+      "ext/iconv sanity check failed: neither 'iconv()' nor 'libiconv()' "
+      "function could be found."
     )
   endif()
 
@@ -124,16 +127,16 @@ 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 _PHP_HAVE_GNU_LIBICONV)
   cmake_pop_check_state()
-  if(_have_gnu_libiconv)
+  if(_PHP_HAVE_GNU_LIBICONV)
     message(CHECK_PASS "GNU libiconv")
     set(HAVE_LIBICONV TRUE)
     set(PHP_ICONV_IMPL "libiconv")
   endif()
 
   # Check for glibc implementation.
-  if(NOT _have_gnu_libiconv)
+  if(NOT _PHP_HAVE_GNU_LIBICONV)
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_LIBRARIES Iconv::Iconv)
       set(CMAKE_REQUIRED_QUIET TRUE)
@@ -146,20 +149,20 @@ if(TARGET Iconv::Iconv)
   endif()
 
   # Check for Konstantin Chuguev's iconv implementation.
-  if(NOT _have_gnu_libiconv AND NOT HAVE_GLIBC_ICONV)
+  if(NOT _PHP_HAVE_GNU_LIBICONV AND NOT HAVE_GLIBC_ICONV)
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_LIBRARIES Iconv::Iconv)
       set(CMAKE_REQUIRED_QUIET TRUE)
-      check_symbol_exists(iconv_ccs_init iconv.h _have_bsd_iconv)
+      check_symbol_exists(iconv_ccs_init iconv.h _PHP_HAVE_BSD_ICONV)
     cmake_pop_check_state()
   endif()
-  if(_have_bsd_iconv)
+  if(_PHP_HAVE_BSD_ICONV)
     message(CHECK_PASS "BSD iconv")
     set(PHP_ICONV_IMPL "BSD iconv")
   endif()
 
   # Check for IBM iconv implementation.
-  if(NOT _have_gnu_libiconv AND NOT HAVE_GLIBC_ICONV AND NOT _have_bsd_iconv)
+  if(NOT _PHP_HAVE_GNU_LIBICONV AND NOT HAVE_GLIBC_ICONV AND NOT _PHP_HAVE_BSD_ICONV)
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_LIBRARIES Iconv::Iconv)
       set(CMAKE_REQUIRED_QUIET TRUE)