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