|
 |
1ceb81 |
|
|
|
1ceb81 |
Drop "Configure Command" from phpinfo as it doesn't
|
|
|
1ceb81 |
provide any useful information.
|
|
|
1ceb81 |
The available extensions are not related to this command.
|
|
|
1ceb81 |
|
|
|
1ceb81 |
Replace full GCC name by gcc in php -v output
|
|
|
1ceb81 |
|
|
|
1ceb81 |
|
|
|
1ceb81 |
Also apply
|
|
|
1ceb81 |
|
|
|
1ceb81 |
From 9bf43c45908433d382f0499d529849172d0d8206 Mon Sep 17 00:00:00 2001
|
|
|
1ceb81 |
From: Remi Collet <remi@remirepo.net>
|
|
|
1ceb81 |
Date: Mon, 28 Dec 2020 08:33:09 +0100
|
|
|
1ceb81 |
Subject: [PATCH] rename COMPILER and ARCHITECTURE macro (too generic)
|
|
|
1ceb81 |
|
|
|
1ceb81 |
---
|
|
|
1ceb81 |
configure.ac | 4 ++--
|
|
|
1ceb81 |
ext/standard/info.c | 8 ++++----
|
|
|
1ceb81 |
sapi/cli/php_cli.c | 8 ++++----
|
|
|
1ceb81 |
win32/build/confutils.js | 10 +++++-----
|
|
|
1ceb81 |
4 files changed, 15 insertions(+), 15 deletions(-)
|
|
|
1ceb81 |
|
|
|
1ceb81 |
diff --git a/configure.ac b/configure.ac
|
|
|
1ceb81 |
index 9d9c8b155b07..143dc061346b 100644
|
|
|
1ceb81 |
--- a/configure.ac
|
|
|
1ceb81 |
+++ b/configure.ac
|
|
|
1ceb81 |
@@ -1289,10 +1289,10 @@ if test -n "${PHP_BUILD_PROVIDER}"; then
|
|
|
1ceb81 |
AC_DEFINE_UNQUOTED(PHP_BUILD_PROVIDER,"$PHP_BUILD_PROVIDER",[build provider])
|
|
|
1ceb81 |
fi
|
|
|
1ceb81 |
if test -n "${PHP_BUILD_COMPILER}"; then
|
|
|
1ceb81 |
- AC_DEFINE_UNQUOTED(COMPILER,"$PHP_BUILD_COMPILER",[used compiler for build])
|
|
|
1ceb81 |
+ AC_DEFINE_UNQUOTED(PHP_BUILD_COMPILER,"$PHP_BUILD_COMPILER",[used compiler for build])
|
|
|
1ceb81 |
fi
|
|
|
1ceb81 |
if test -n "${PHP_BUILD_ARCH}"; then
|
|
|
1ceb81 |
- AC_DEFINE_UNQUOTED(ARCHITECTURE,"$PHP_BUILD_ARCH",[build architecture])
|
|
|
1ceb81 |
+ AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
|
|
|
1ceb81 |
fi
|
|
|
1ceb81 |
|
|
|
1ceb81 |
PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
|
|
|
1ceb81 |
diff --git a/ext/standard/info.c b/ext/standard/info.c
|
|
|
1ceb81 |
index 153cb6cde014..8ceef31d9fe4 100644
|
|
|
1ceb81 |
--- a/ext/standard/info.c
|
|
|
1ceb81 |
+++ b/ext/standard/info.c
|
|
|
1ceb81 |
@@ -798,11 +798,11 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
|
|
|
1ceb81 |
#ifdef PHP_BUILD_PROVIDER
|
|
|
1ceb81 |
php_info_print_table_row(2, "Build Provider", PHP_BUILD_PROVIDER);
|
|
|
1ceb81 |
#endif
|
|
|
1ceb81 |
-#ifdef COMPILER
|
|
|
1ceb81 |
- php_info_print_table_row(2, "Compiler", COMPILER);
|
|
|
1ceb81 |
+#ifdef PHP_BUILD_COMPILER
|
|
|
1ceb81 |
+ php_info_print_table_row(2, "Compiler", PHP_BUILD_COMPILER);
|
|
|
1ceb81 |
#endif
|
|
|
1ceb81 |
-#ifdef ARCHITECTURE
|
|
|
1ceb81 |
- php_info_print_table_row(2, "Architecture", ARCHITECTURE);
|
|
|
1ceb81 |
+#ifdef PHP_BUILD_ARCH
|
|
|
1ceb81 |
+ php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
|
|
|
1ceb81 |
#endif
|
|
|
1ceb81 |
#ifdef CONFIGURE_COMMAND
|
|
|
1ceb81 |
php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
|
|
|
1ceb81 |
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
|
|
|
1ceb81 |
index 5092fb0ffd68..9d296acec631 100644
|
|
|
1ceb81 |
--- a/sapi/cli/php_cli.c
|
|
|
1ceb81 |
+++ b/sapi/cli/php_cli.c
|
|
|
1ceb81 |
@@ -640,12 +640,12 @@ static int do_cli(int argc, char **argv) /* {{{ */
|
|
|
1ceb81 |
#else
|
|
|
1ceb81 |
"NTS "
|
|
|
1ceb81 |
#endif
|
|
|
1ceb81 |
-#ifdef COMPILER
|
|
|
1ceb81 |
- COMPILER
|
|
|
1ceb81 |
+#ifdef PHP_BUILD_COMPILER
|
|
|
1ceb81 |
+ PHP_BUILD_COMPILER
|
|
|
1ceb81 |
" "
|
|
|
1ceb81 |
#endif
|
|
|
1ceb81 |
-#ifdef ARCHITECTURE
|
|
|
1ceb81 |
- ARCHITECTURE
|
|
|
1ceb81 |
+#ifdef PHP_BUILD_ARCH
|
|
|
1ceb81 |
+ PHP_BUILD_ARCH
|
|
|
1ceb81 |
" "
|
|
|
1ceb81 |
#endif
|
|
|
1ceb81 |
#if ZEND_DEBUG
|
|
|
1ceb81 |
|
|
|
1ceb81 |
diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c
|
|
|
1ceb81 |
--- ./ext/standard/info.c.phpinfo 2020-07-21 10:49:31.000000000 +0200
|
|
|
1ceb81 |
+++ ./ext/standard/info.c 2020-07-21 11:41:56.295633523 +0200
|
|
|
1ceb81 |
@@ -804,9 +804,6 @@ PHPAPI ZEND_COLD void php_print_info(int
|
|
|
1ceb81 |
#ifdef PHP_BUILD_ARCH
|
|
|
1ceb81 |
php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
|
|
|
1ceb81 |
#endif
|
|
|
1ceb81 |
-#ifdef CONFIGURE_COMMAND
|
|
|
1ceb81 |
- php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
|
|
|
1ceb81 |
-#endif
|
|
|
1ceb81 |
|
|
|
1ceb81 |
if (sapi_module.pretty_name) {
|
|
|
1ceb81 |
php_info_print_table_row(2, "Server API", sapi_module.pretty_name );
|
|
|
1ceb81 |
diff -up ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/standard/tests/general_functions/phpinfo.phpt
|
|
|
1ceb81 |
--- ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo 2020-07-21 10:49:31.000000000 +0200
|
|
|
1ceb81 |
+++ ./ext/standard/tests/general_functions/phpinfo.phpt 2020-07-21 11:41:56.296633522 +0200
|
|
|
1ceb81 |
@@ -17,7 +17,6 @@ PHP Version => %s
|
|
|
1ceb81 |
|
|
|
1ceb81 |
System => %s
|
|
|
1ceb81 |
Build Date => %s%a
|
|
|
1ceb81 |
-Configure Command => %s
|
|
|
1ceb81 |
Server API => Command Line Interface
|
|
|
1ceb81 |
Virtual Directory Support => %s
|
|
|
1ceb81 |
Configuration File (php.ini) Path => %s
|
|
|
1ceb81 |
diff -up ./sapi/cli/php_cli.c.phpinfo ./sapi/cli/php_cli.c
|
|
|
1ceb81 |
--- ./sapi/cli/php_cli.c.phpinfo 2020-07-21 11:43:38.812475300 +0200
|
|
|
1ceb81 |
+++ ./sapi/cli/php_cli.c 2020-07-21 11:43:45.783464540 +0200
|
|
|
1ceb81 |
@@ -641,8 +641,7 @@ static int do_cli(int argc, char **argv)
|
|
|
1ceb81 |
"NTS "
|
|
|
1ceb81 |
#endif
|
|
|
1ceb81 |
#ifdef PHP_BUILD_COMPILER
|
|
|
1ceb81 |
- PHP_BUILD_COMPILER
|
|
|
1ceb81 |
- " "
|
|
|
1ceb81 |
+ "gcc "
|
|
|
1ceb81 |
#endif
|
|
|
1ceb81 |
#ifdef PHP_BUILD_ARCH
|
|
|
1ceb81 |
PHP_BUILD_ARCH
|