Merge branch 'PHP-8.4'

petk · petk · commit 20195d7644fe · 2025-08-09T01:25:25.000+02:00
diff --git a/cmake/cmake/modules/FindBZip2.cmake b/cmake/cmake/modules/FindBZip2.cmake
@@ -0,0 +1,18 @@
+#[=============================================================================[
+# FindBZip2
+
+This module overrides the upstream CMake `FindBZip2` module with few
+customizations:
+
+* Added BZip2_VERSION result variable for CMake < 4.2.
+
+See: https://cmake.org/cmake/help/latest/module/FindBZip2.html
+#]=============================================================================]
+
+# Find package with upstream CMake find module. Absolute path prevents the
+# maximum nesting/recursion depth error on some systems, like macOS.
+include(${CMAKE_ROOT}/Modules/FindBZip2.cmake)
+
+if(CMAKE_VERSION VERSION_LESS 4.2)
+  set(BZip2_VERSION "${BZIP2_VERSION}")
+endif()
diff --git a/cmake/cmake/modules/FindLibXml2.cmake b/cmake/cmake/modules/FindLibXml2.cmake
@@ -0,0 +1,18 @@
+#[=============================================================================[
+# FindLibXml2
+
+This module overrides the upstream CMake `FindLibXml2` module with few
+customizations:
+
+* Added LibXml2_VERSION result variable for CMake < 4.2.
+
+See: https://cmake.org/cmake/help/latest/module/FindLibXml2.html
+#]=============================================================================]
+
+# Find package with upstream CMake find module. Absolute path prevents the
+# maximum nesting/recursion depth error on some systems, like macOS.
+include(${CMAKE_ROOT}/Modules/FindLibXml2.cmake)
+
+if(CMAKE_VERSION VERSION_LESS 4.2)
+  set(LibXml2_VERSION "${LIBXML2_VERSION_STRING}")
+endif()
diff --git a/cmake/cmake/modules/FindPostgreSQL.cmake b/cmake/cmake/modules/FindPostgreSQL.cmake
@@ -0,0 +1,18 @@
+#[=============================================================================[
+# FindPostgreSQL
+
+This module overrides the upstream CMake `FindPostgreSQL` module with few
+customizations:
+
+* Added PostgreSQL_VERSION result variable for CMake < 4.2.
+
+See: https://cmake.org/cmake/help/latest/module/FindPostgreSQL.html
+#]=============================================================================]
+
+# Find package with upstream CMake find module. Absolute path prevents the
+# maximum nesting/recursion depth error on some systems, like macOS.
+include(${CMAKE_ROOT}/Modules/FindPostgreSQL.cmake)
+
+if(CMAKE_VERSION VERSION_LESS 4.2)
+  set(PostgreSQL_VERSION "${PostgreSQL_VERSION_STRING}")
+endif()
diff --git a/cmake/ext/bz2/CMakeLists.txt b/cmake/ext/bz2/CMakeLists.txt
@@ -90,7 +90,7 @@ if(TARGET BZip2::BZip2)
     # the FILE definition. BZ2_bzerror() is available as of 1.0.0.
     block()
       set(headers "bzlib.h")
-      if(BZIP2_VERSION VERSION_LESS 1.0.2)
+      if(BZip2_VERSION VERSION_LESS 1.0.2)
         list(PREPEND headers "stdio.h")
       endif()
       check_symbol_exists(BZ2_bzerror "${headers}" PHP_EXT_BZ2_SANITY_CHECK)
diff --git a/cmake/ext/libxml/CMakeLists.txt b/cmake/ext/libxml/CMakeLists.txt
@@ -76,7 +76,7 @@ set_package_properties(
 )
 
 # HAVE_WIN32_THREADS is not needed on newer libxml2 versions anymore.
-if(LIBXML2_VERSION_STRING VERSION_LESS 2.10)
+if(LibXml2_VERSION VERSION_LESS 2.10)
   target_compile_definitions(
     php_ext_libxml
     PRIVATE
diff --git a/cmake/ext/pdo_pgsql/CMakeLists.txt b/cmake/ext/pdo_pgsql/CMakeLists.txt
@@ -97,7 +97,7 @@ if(TARGET PostgreSQL::PostgreSQL)
     endif()
 
     # Available since PostgreSQL library version 12.
-    if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 12)
+    if(PostgreSQL_VERSION VERSION_GREATER_EQUAL 12)
       check_symbol_exists(
         PQresultMemorySize
         libpq-fe.h
@@ -106,7 +106,7 @@ if(TARGET PostgreSQL::PostgreSQL)
     endif()
 
     # Available since PostgreSQL library version 17.
-    if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 17)
+    if(PostgreSQL_VERSION VERSION_GREATER_EQUAL 17)
       # Indicates the presence of PQclosePrepared, PQclosePortal, etc.
       check_symbol_exists(
         LIBPQ_HAS_CLOSE_PREPARED
diff --git a/cmake/ext/pgsql/CMakeLists.txt b/cmake/ext/pgsql/CMakeLists.txt
@@ -101,7 +101,7 @@ if(TARGET PostgreSQL::PostgreSQL)
     endif()
 
     # Available since PostgreSQL library version 12.
-    if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 12)
+    if(PostgreSQL_VERSION VERSION_GREATER_EQUAL 12)
       check_symbol_exists(
         PQresultMemorySize
         libpq-fe.h
@@ -115,7 +115,7 @@ if(TARGET PostgreSQL::PostgreSQL)
     endif()
 
     # Available since PostgreSQL library version 17.
-    if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 17)
+    if(PostgreSQL_VERSION VERSION_GREATER_EQUAL 17)
       # Indicates the presence of PQchangePassword.
       check_symbol_exists(
         LIBPQ_HAS_CHANGE_PASSWORD
@@ -178,7 +178,7 @@ if(TARGET PostgreSQL::PostgreSQL)
     endif()
 
     # Available since PostgreSQL library version 18.
-    if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 18)
+    if(PostgreSQL_VERSION VERSION_GREATER_EQUAL 18)
       # Indicates the presence of PQservice.
       check_symbol_exists(
         PQservice
diff --git a/docs/cmake/modules/FindBZip2.md b/docs/cmake/modules/FindBZip2.md
@@ -0,0 +1,29 @@
+<!-- This is auto-generated file. -->
+* Source code: [cmake/modules/FindBZip2.cmake](https://github.com/petk/php-build-system/blob/master/cmake/cmake/modules/FindBZip2.cmake)
+
+# FindBZip2
+
+This module overrides the upstream CMake `FindBZip2` module with few
+customizations:
+
+* Added BZip2_VERSION result variable for CMake < 4.2.
+
+See: https://cmake.org/cmake/help/latest/module/FindBZip2.html
+
+## Customizing search locations
+
+To customize where to look for the BZip2 package base
+installation directory, a common `CMAKE_PREFIX_PATH` or
+package-specific `BZIP2_ROOT` variable can be set at
+the configuration phase. For example:
+
+```sh
+cmake -S <source-dir> \
+      -B <build-dir> \
+      -DCMAKE_PREFIX_PATH="/opt/BZip2;/opt/some-other-package"
+# or
+cmake -S <source-dir> \
+      -B <build-dir> \
+      -DBZIP2_ROOT=/opt/BZip2 \
+      -DSOMEOTHERPACKAGE_ROOT=/opt/some-other-package
+```
diff --git a/docs/cmake/modules/FindLibXml2.md b/docs/cmake/modules/FindLibXml2.md
@@ -0,0 +1,29 @@
+<!-- This is auto-generated file. -->
+* Source code: [cmake/modules/FindLibXml2.cmake](https://github.com/petk/php-build-system/blob/master/cmake/cmake/modules/FindLibXml2.cmake)
+
+# FindLibXml2
+
+This module overrides the upstream CMake `FindLibXml2` module with few
+customizations:
+
+* Added LibXml2_VERSION result variable for CMake < 4.2.
+
+See: https://cmake.org/cmake/help/latest/module/FindLibXml2.html
+
+## Customizing search locations
+
+To customize where to look for the LibXml2 package base
+installation directory, a common `CMAKE_PREFIX_PATH` or
+package-specific `LIBXML2_ROOT` variable can be set at
+the configuration phase. For example:
+
+```sh
+cmake -S <source-dir> \
+      -B <build-dir> \
+      -DCMAKE_PREFIX_PATH="/opt/LibXml2;/opt/some-other-package"
+# or
+cmake -S <source-dir> \
+      -B <build-dir> \
+      -DLIBXML2_ROOT=/opt/LibXml2 \
+      -DSOMEOTHERPACKAGE_ROOT=/opt/some-other-package
+```
diff --git a/docs/cmake/modules/FindPostgreSQL.md b/docs/cmake/modules/FindPostgreSQL.md
@@ -0,0 +1,29 @@
+<!-- This is auto-generated file. -->
+* Source code: [cmake/modules/FindPostgreSQL.cmake](https://github.com/petk/php-build-system/blob/master/cmake/cmake/modules/FindPostgreSQL.cmake)
+
+# FindPostgreSQL
+
+This module overrides the upstream CMake `FindPostgreSQL` module with few
+customizations:
+
+* Added PostgreSQL_VERSION result variable for CMake < 4.2.
+
+See: https://cmake.org/cmake/help/latest/module/FindPostgreSQL.html
+
+## Customizing search locations
+
+To customize where to look for the PostgreSQL package base
+installation directory, a common `CMAKE_PREFIX_PATH` or
+package-specific `POSTGRESQL_ROOT` variable can be set at
+the configuration phase. For example:
+
+```sh
+cmake -S <source-dir> \
+      -B <build-dir> \
+      -DCMAKE_PREFIX_PATH="/opt/PostgreSQL;/opt/some-other-package"
+# or
+cmake -S <source-dir> \
+      -B <build-dir> \
+      -DPOSTGRESQL_ROOT=/opt/PostgreSQL \
+      -DSOMEOTHERPACKAGE_ROOT=/opt/some-other-package
+```

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ set_package_properties(`
`76`	`76`	`)`
`77`	`77`
`78`	`78`	`# HAVE_WIN32_THREADS is not needed on newer libxml2 versions anymore.`
`79`		`-if(LIBXML2_VERSION_STRING VERSION_LESS 2.10)`
	`79`	`+if(LibXml2_VERSION VERSION_LESS 2.10)`
`80`	`80`	`target_compile_definitions(`
`81`	`81`	`php_ext_libxml`
`82`	`82`	`PRIVATE`