Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/modules/FindTidy.cmake

@@ -86,9 +86,9 @@ if(Tidy_INCLUDE_DIR)
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_INCLUDES ${Tidy_INCLUDE_DIR})
 
-    # Check for tidybuffio.h (as opposed to simply buffio.h) which indicates
+    # Check for tidybuffio.h (as opposed to the legacy buffio.h) which indicates
     # that the found library is tidy-html5 and not the legacy htmltidy. The two
-    # are compatible, except the legacy doesn't have this header.
+    # are compatible, except the legacy doesn't have the tidybuffio.h header.
     check_include_files(tidybuffio.h HAVE_TIDYBUFFIO_H)
 
     check_include_files(tidy.h HAVE_TIDY_H)

cmake/ext/bz2/CMakeLists.txt

@@ -28,8 +28,9 @@ project(
   LANGUAGES C
 )
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
 include(CMakeDependentOption)
+include(CMakePushCheckState)
 include(FeatureSummary)
 
 option(PHP_EXT_BZ2 "Enable the bz2 extension")
@@ -83,17 +84,21 @@ set_package_properties(
 # Link with PUBLIC scope if include directories are on non-standard places.
 target_link_libraries(php_ext_bz2 PUBLIC BZip2::BZip2)
 
-# Sanity check.
+# Minimum version sanity check.
 if(TARGET BZip2::BZip2)
-  check_library_exists(BZip2::BZip2 BZ2_bzerror "" _HAVE_BZ2_BZERROR)
-
-  if(NOT _HAVE_BZ2_BZERROR)
-    message(
-      FATAL_ERROR
-      "BZip2 package is not working as expected. The bz2 extension requires "
-      "BZip2 library (libbzip2) version ${PHP_BZIP2_MIN_VERSION} or later."
-    )
-  endif()
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_LIBRARIES BZip2::BZip2)
+
+    check_symbol_exists(BZ2_bzerror bzlib.h _PHP_HAVE_BZ2_BZERROR)
+
+    if(NOT _PHP_HAVE_BZ2_BZERROR)
+      message(
+        FATAL_ERROR
+        "BZip2 package is not working as expected. The bz2 extension requires "
+        "BZip2 library (libbzip2) version ${PHP_BZIP2_MIN_VERSION} or later."
+      )
+    endif()
+  cmake_pop_check_state()
 endif()
 
 set(HAVE_BZ2 TRUE)

cmake/ext/curl/CMakeLists.txt

@@ -28,8 +28,8 @@ project(
 )
 
 include(CheckIncludeFiles)
-include(CheckLibraryExists)
 include(CheckSourceRuns)
+include(CheckSymbolExists)
 include(CMakeDependentOption)
 include(CMakePushCheckState)
 include(FeatureSummary)
@@ -166,15 +166,21 @@ endif()
 
 # Sanity check.
 if(TARGET CURL::libcurl)
-  check_library_exists(
-    CURL::libcurl
-    curl_easy_perform
-    ""
-    HAVE_CURL_EASY_PERFORM
-  )
-
-  if(NOT HAVE_CURL_EASY_PERFORM)
-    message(FATAL_ERROR "The 'curl_easy_perform()' couldn't be found.")
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_LIBRARIES CURL::libcurl)
+
+    check_symbol_exists(
+      curl_easy_perform
+      curl/curl.h
+      _PHP_HAVE_CURL_EASY_PERFORM
+    )
+  cmake_pop_check_state()
+
+  if(NOT _PHP_HAVE_CURL_EASY_PERFORM)
+    message(
+      FATAL_ERROR
+      "ext/curl sanity check failed: 'curl_easy_perform()' could not be found."
+    )
   endif()
 endif()
 

cmake/ext/enchant/CMakeLists.txt

@@ -27,8 +27,9 @@ project(
   LANGUAGES C
 )
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
 include(CMakeDependentOption)
+include(CMakePushCheckState)
 include(FeatureSummary)
 
 option(PHP_EXT_ENCHANT "Enable the enchant extension")
@@ -73,21 +74,23 @@ set_package_properties(
 )
 
 if(TARGET Enchant::Enchant)
-  # The enchant_get_version() is available since 1.6.0.
-  check_library_exists(
-    Enchant::Enchant
-    enchant_get_version
-    ""
-    HAVE_ENCHANT_GET_VERSION
-  )
-
-  # The enchant_broker_set_param() is available since 1.5.0 and removed in 2.x.
-  check_library_exists(
-    Enchant::Enchant
-    enchant_broker_set_param
-    ""
-    HAVE_ENCHANT_BROKER_SET_PARAM
-  )
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_LIBRARIES Enchant::Enchant)
+
+    # The enchant_get_version() is available since 1.6.0.
+    check_symbol_exists(
+      enchant_get_version
+      enchant.h
+      HAVE_ENCHANT_GET_VERSION
+    )
+
+    # The enchant_broker_set_param() is available since 1.5.0 and removed in 2.x.
+    check_symbol_exists(
+      enchant_broker_set_param
+      enchant.h
+      HAVE_ENCHANT_BROKER_SET_PARAM
+    )
+  cmake_pop_check_state()
 endif()
 
 target_link_libraries(php_ext_enchant PRIVATE Enchant::Enchant)

cmake/ext/gd/CMakeLists.txt

@@ -77,9 +77,9 @@ project(
   LANGUAGES C
 )
 
-include(CheckLibraryExists)
 include(CheckSourceCompiles)
 include(CheckSourceRuns)
+include(CheckSymbolExists)
 include(CMakeDependentOption)
 include(CMakePushCheckState)
 include(FeatureSummary)
@@ -430,11 +430,11 @@ if(NOT PHP_EXT_GD_EXTERNAL)
         check_source_compiles(
           C
           [[int main(void) { return 0; }]]
-          _GD_SANITY_CHECK_COMPILES
+          _PHP_GD_SANITY_CHECK_COMPILES
         )
       cmake_pop_check_state()
 
-      if(NOT _GD_SANITY_CHECK_COMPILES)
+      if(NOT _PHP_GD_SANITY_CHECK_COMPILES)
         message(FATAL_ERROR "GD sanity check failed.")
       endif()
     endif()
@@ -454,7 +454,10 @@ else()
 
   if(TARGET GD::GD)
     # Sanity check.
-    check_library_exists(GD::GD gdImageCreate "" HAVE_LIBGD)
+    cmake_push_check_state(RESET)
+      set(CMAKE_REQUIRED_LIBRARIES GD::GD)
+      check_symbol_exists(gdImageCreate gd.h HAVE_LIBGD)
+    cmake_pop_check_state()
 
     if(NOT HAVE_LIBGD)
       message(
@@ -522,14 +525,17 @@ else()
     php_ext_gd_check_format(Bmp HAVE_GD_BMP)
     php_ext_gd_check_format(Tga HAVE_GD_TGA)
 
-    check_library_exists(GD::GD gdFontCacheShutdown "" HAVE_GD_FREETYPE)
-    check_library_exists(GD::GD gdVersionString "" HAVE_GD_LIBVERSION)
-    check_library_exists(
-      GD::GD
-      gdImageGetInterpolationMethod
-      ""
-      HAVE_GD_GET_INTERPOLATION
-    )
+    cmake_push_check_state(RESET)
+      set(CMAKE_REQUIRED_LIBRARIES GD::GD)
+
+      check_symbol_exists(gdFontCacheShutdown gd.h HAVE_GD_FREETYPE)
+      check_symbol_exists(gdVersionString gd.h HAVE_GD_LIBVERSION)
+      check_symbol_exists(
+        gdImageGetInterpolationMethod
+        gd.h
+        HAVE_GD_GET_INTERPOLATION
+      )
+    cmake_pop_check_state()
   endif()
 endif()
 

cmake/ext/tidy/CMakeLists.txt

@@ -28,8 +28,9 @@ project(
   LANGUAGES C
 )
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
 include(CMakeDependentOption)
+include(CMakePushCheckState)
 include(FeatureSummary)
 include(PHP/CheckCompilerFlag)
 
@@ -62,7 +63,7 @@ endif()
 target_sources(
   php_ext_tidy
   PRIVATE
-    php_tidy.def
+    $<$<AND:$<PLATFORM_ID:Windows>,$<NOT:$<IN_LIST:$<TARGET_PROPERTY:TYPE>,MODULE_LIBRARY;SHARED_LIBRARY>>>:php_tidy.def>
     tidy.c
     tidy.stub.php
 )
@@ -73,9 +74,9 @@ if(Tidy_VERSION VERSION_LESS 5.7.20)
   php_check_compiler_flag(
     C
     -Wno-ignored-qualifiers
-    HAVE_WNO_IGNORED_QUALIFIERS_C
+    _PHP_HAVE_WNO_IGNORED_QUALIFIERS_C
   )
-  if(HAVE_WNO_IGNORED_QUALIFIERS_C)
+  if(_PHP_HAVE_WNO_IGNORED_QUALIFIERS_C)
     target_compile_options(php_ext_tidy PRIVATE -Wno-ignored-qualifiers)
   endif()
 endif()
@@ -93,8 +94,19 @@ set_package_properties(
 target_link_libraries(php_ext_tidy PRIVATE Tidy::Tidy)
 
 if(TARGET Tidy::Tidy)
-  check_library_exists(Tidy::Tidy tidyOptGetDoc "" HAVE_TIDYOPTGETDOC)
-  check_library_exists(Tidy::Tidy tidyReleaseDate "" HAVE_TIDYRELEASEDATE)
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_LIBRARIES Tidy::Tidy)
+
+    set(header "")
+    if(HAVE_TIDY_H)
+      set(header tidy.h)
+    elseif(HAVE_TIDYP_H)
+      set(header tidyp.h)
+    endif()
+
+    check_symbol_exists(tidyOptGetDoc "${header}" HAVE_TIDYOPTGETDOC)
+    check_symbol_exists(tidyReleaseDate "${header}" HAVE_TIDYRELEASEDATE)
+  cmake_pop_check_state()
 endif()
 
 set(HAVE_TIDY TRUE)

cmake/ext/zip/CMakeLists.txt

@@ -27,8 +27,9 @@ project(
   LANGUAGES C
 )
 
-include(CheckLibraryExists)
+include(CheckSymbolExists)
 include(CMakeDependentOption)
+include(CMakePushCheckState)
 include(FeatureSummary)
 
 option(PHP_EXT_ZIP "Enable the zip extension")
@@ -110,55 +111,53 @@ endif()
 # required.
 
 if(TARGET libzip::libzip)
-  check_library_exists(
-    libzip::libzip
-    zip_file_set_mtime
-    ""
-    HAVE_SET_MTIME
-  )
-
-  if(NOT HAVE_SET_MTIME)
-    message(WARNING "Libzip >= 1.0.0 needed for setting mtime")
-  endif()
-
-  check_library_exists(
-    libzip::libzip
-    zip_file_set_encryption
-    ""
-    HAVE_ENCRYPTION
-  )
-
-  if(NOT HAVE_ENCRYPTION)
-    message(WARNING "Libzip >= 1.2.0 needed for encryption support")
-  endif()
-
-  check_library_exists(
-    libzip::libzip
-    zip_libzip_version
-    ""
-    HAVE_LIBZIP_VERSION
-  )
-
-  check_library_exists(
-    libzip::libzip
-    zip_register_progress_callback_with_state
-    ""
-    HAVE_PROGRESS_CALLBACK
-  )
-
-  check_library_exists(
-    libzip::libzip
-    zip_register_cancel_callback_with_state
-    ""
-    HAVE_CANCEL_CALLBACK
-  )
-
-  check_library_exists(
-    libzip::libzip
-    zip_compression_method_supported
-    ""
-    HAVE_METHOD_SUPPORTED
-  )
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_LIBRARIES libzip::libzip)
+
+    check_symbol_exists(zip_file_set_mtime zip.h HAVE_SET_MTIME)
+
+    if(NOT HAVE_SET_MTIME)
+      message(
+        WARNING
+        "ext/zip will not have support for setting mtime "
+        "(Libzip >= 1.0.0 is needed for setting mtime)"
+      )
+    endif()
+
+    check_symbol_exists(zip_file_set_encryption zip.h HAVE_ENCRYPTION)
+
+    if(NOT HAVE_ENCRYPTION)
+      message(
+        WARNING
+        "ext/zip will not have encryption support "
+        "(Libzip >= 1.2.0 is needed for encryption support)"
+      )
+    endif()
+
+    check_symbol_exists(
+      zip_libzip_version
+      zip.h
+      HAVE_LIBZIP_VERSION
+    )
+
+    check_symbol_exists(
+      zip_register_progress_callback_with_state
+      zip.h
+      HAVE_PROGRESS_CALLBACK
+    )
+
+    check_symbol_exists(
+      zip_register_cancel_callback_with_state
+      zip.h
+      HAVE_CANCEL_CALLBACK
+    )
+
+    check_symbol_exists(
+      zip_compression_method_supported
+      zip.h
+      HAVE_METHOD_SUPPORTED
+    )
+  cmake_pop_check_state()
 endif()
 
 set(HAVE_ZIP TRUE)