Merge branch 'PHP-8.4'

Author: petk

patches/8.5/cmake.patch

@@ -122,10 +122,10 @@ index e691bd3964..c4077b0a8d 100644
 +CMakeScripts/
 +/TryRunResults.cmake
 diff --git a/run-tests.php b/run-tests.php
-index bd03a7f882..9b950396f8 100755
+index 7ab158bce5..ee1c35f2fb 100755
 --- a/run-tests.php
 +++ b/run-tests.php
-@@ -865,10 +865,12 @@ function write_information(array $user_tests, $phpdbg): void
+@@ -848,10 +848,12 @@ function write_information(array $user_tests, $phpdbg): void
          <?php
          $exts = get_loaded_extensions();
          $ext_dir = ini_get('extension_dir');
@@ -142,7 +142,7 @@ index bd03a7f882..9b950396f8 100755
                  }
              }
          }
-@@ -957,7 +959,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
+@@ -940,7 +942,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
 
      $failed_tests_data .= "\n" . $sep . 'BUILD ENVIRONMENT' . $sep;
      $failed_tests_data .= "OS:\n" . PHP_OS . " - " . php_uname() . "\n\n";
@@ -151,7 +151,7 @@ index bd03a7f882..9b950396f8 100755
 
      if (!IS_WINDOWS) {
          /* If PHP_AUTOCONF is set, use it; otherwise, use 'autoconf'. */
-@@ -968,7 +970,9 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
+@@ -951,7 +953,9 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
          }
 
          /* Always use the generated libtool - Mac OSX uses 'glibtool' */
@@ -162,7 +162,7 @@ index bd03a7f882..9b950396f8 100755
 
          /* Use shtool to find out if there is glibtool present (MacOSX) */
          $sys_libtool_path = shell_exec(__DIR__ . '/build/shtool path glibtool libtool');
-@@ -990,9 +994,17 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
+@@ -973,9 +977,17 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
          }
 
          $ldd = shell_exec("ldd $php 2>/dev/null");