Skip to content

Commit d12b4d8

Browse files
committed
Update patches
1 parent 332c74f commit d12b4d8

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

patches/8.3/dmalloc.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ See: https://github.com/php/php-src/pull/8465
1010
1 file changed, 2 insertions(+), 1 deletion(-)
1111

1212
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
13-
index 585ac8ab9d..4c7cb05460 100644
13+
index 19edc0cd3e..dba4eefb18 100644
1414
--- a/sapi/cli/php_cli_server.c
1515
+++ b/sapi/cli/php_cli_server.c
1616
@@ -15,6 +15,8 @@

patches/8.4/dmalloc.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ See: https://github.com/php/php-src/pull/8465
1010
1 file changed, 2 insertions(+), 1 deletion(-)
1111

1212
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
13-
index bcf5af320d..0fb5537258 100644
13+
index 492576b732..6f35eb3e17 100644
1414
--- a/sapi/cli/php_cli_server.c
1515
+++ b/sapi/cli/php_cli_server.c
1616
@@ -15,6 +15,8 @@

patches/8.4/php-config.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ index e45b22b766..74f0e25b01 100644
5858
])
5959

6060
diff --git a/configure.ac b/configure.ac
61-
index 6b61df11ab..0ba3ed3c3d 100644
61+
index cab7e839a7..0accb28496 100644
6262
--- a/configure.ac
6363
+++ b/configure.ac
6464
@@ -1363,6 +1363,9 @@ exec_prefix=$old_exec_prefix

patches/8.5/cmake.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ index d54334f599..b879e2a5c3 100644
8080
+# Generated by cmake when cross-compiling if missing cache variables are found
8181
+/TryRunResults.cmake
8282
diff --git a/ext/ext_skel.php b/ext/ext_skel.php
83-
index ae7a3a987c..62241fff9c 100755
83+
index cd82abb346..84b5fdccfe 100755
8484
--- a/ext/ext_skel.php
8585
+++ b/ext/ext_skel.php
86-
@@ -302,6 +302,8 @@ function copy_config_scripts() {
86+
@@ -289,6 +289,8 @@ function copy_config_scripts() {
8787
$files[] = 'config.w32';
8888
}
8989

@@ -123,10 +123,10 @@ index e691bd3964..c4077b0a8d 100644
123123
+CMakeScripts/
124124
+/TryRunResults.cmake
125125
diff --git a/run-tests.php b/run-tests.php
126-
index 7ab158bce5..ee1c35f2fb 100755
126+
index 258eae1fb2..66996c0908 100755
127127
--- a/run-tests.php
128128
+++ b/run-tests.php
129-
@@ -848,10 +848,12 @@ function write_information(array $user_tests, $phpdbg): void
129+
@@ -847,10 +847,12 @@ function write_information(array $user_tests, $phpdbg): void
130130
<?php
131131
$exts = get_loaded_extensions();
132132
$ext_dir = ini_get('extension_dir');
@@ -143,7 +143,7 @@ index 7ab158bce5..ee1c35f2fb 100755
143143
}
144144
}
145145
}
146-
@@ -940,7 +942,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
146+
@@ -939,7 +941,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
147147

148148
$failed_tests_data .= "\n" . $sep . 'BUILD ENVIRONMENT' . $sep;
149149
$failed_tests_data .= "OS:\n" . PHP_OS . " - " . php_uname() . "\n\n";
@@ -152,7 +152,7 @@ index 7ab158bce5..ee1c35f2fb 100755
152152

153153
if (!IS_WINDOWS) {
154154
/* If PHP_AUTOCONF is set, use it; otherwise, use 'autoconf'. */
155-
@@ -951,7 +953,9 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
155+
@@ -950,7 +952,9 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
156156
}
157157

158158
/* Always use the generated libtool - Mac OSX uses 'glibtool' */
@@ -163,7 +163,7 @@ index 7ab158bce5..ee1c35f2fb 100755
163163

164164
/* Use shtool to find out if there is glibtool present (MacOSX) */
165165
$sys_libtool_path = shell_exec(__DIR__ . '/build/shtool path glibtool libtool');
166-
@@ -973,9 +977,17 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
166+
@@ -972,9 +976,17 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
167167
}
168168

169169
$ldd = shell_exec("ldd $php 2>/dev/null");

patches/8.5/dmalloc.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ See: https://github.com/php/php-src/pull/8465
1010
1 file changed, 2 insertions(+), 1 deletion(-)
1111

1212
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
13-
index fc2e282995..877007bd86 100644
13+
index 9e8d8d1b8a..4c64d8d6ff 100644
1414
--- a/sapi/cli/php_cli_server.c
1515
+++ b/sapi/cli/php_cli_server.c
1616
@@ -15,6 +15,8 @@

0 commit comments

Comments
 (0)