Use build-time OS information; expose only compiler major version

Author: arnaud-lb

configure.ac

@@ -1412,6 +1412,16 @@ AC_ARG_VAR([PHP_UNAME],
 AS_VAR_IF([PHP_UNAME],, [PHP_UNAME=$(uname -a | xargs)])
 AC_DEFINE_UNQUOTED([PHP_UNAME], ["$PHP_UNAME"], [The 'uname -a' output.])
 
+AC_ARG_VAR([PHP_UNAME_S],
+  [Operating system name (defaults to the 'uname -s' output)])
+AS_VAR_IF([PHP_UNAME_S],, [PHP_UNAME_S=$(uname -s | xargs)])
+AC_DEFINE_UNQUOTED([PHP_UNAME_S], ["$PHP_UNAME_S"], [The 'uname -s' output.])
+
+AC_ARG_VAR([PHP_UNAME_R],
+  [Operating system version (defaults to the 'uname -r' output)])
+AS_VAR_IF([PHP_UNAME_R],, [PHP_UNAME_R=$(uname -r | xargs)])
+AC_DEFINE_UNQUOTED([PHP_UNAME_R], ["$PHP_UNAME_R"], [The 'uname -r' output.])
+
 PHP_OS=$(uname | xargs)
 AC_DEFINE_UNQUOTED([PHP_OS], ["$PHP_OS"], [The 'uname' output.])
 

main/main.c

@@ -121,12 +121,9 @@ ZEND_ATTRIBUTE_CONST PHPAPI const char *php_build_provider(void)
 
 PHPAPI char *php_get_version(sapi_module_struct *sapi_module)
 {
-	zend_string *os = php_get_uname('s');
-	zend_string *os_version = php_get_uname('r');
-
 	smart_string version_info = {0};
 	smart_string_append_printf(&version_info,
-		"PHP %s (%s) (built: %s) (%s) (%s %s%s)\n",
+		"PHP %s (%s) (built: %s) (%s)\n",
 		PHP_VERSION, sapi_module->name, php_build_date,
 #ifdef ZTS
 		"ZTS"
@@ -144,25 +141,23 @@ PHPAPI char *php_get_version(sapi_module_struct *sapi_module)
 #else
 		" Unknown arch"
 #endif
-		,
-		ZSTR_VAL(os),
-		ZSTR_VAL(os_version),
+	);
+	smart_string_appends(&version_info, "Copyright (c) The PHP Group\n");
+	smart_string_append_printf(&version_info, "Built %s\n",
+#ifdef PHP_BUILD_PROVIDER
+		"by " PHP_BUILD_PROVIDER
+#else
+		"on " PHP_UNAME_S " " PHP_UNAME_R
+#endif
 #ifdef PHP_BUILD_COMPILER
-		" " PHP_BUILD_COMPILER
+		" (" PHP_BUILD_COMPILER ")"
 #else
-		" Unknown compiler"
+		""
 #endif
 	);
-	smart_string_appends(&version_info, "Copyright (c) The PHP Group\n");
-	if (php_build_provider()) {
-		smart_string_append_printf(&version_info, "Built by %s\n", php_build_provider());
-	}
 	smart_string_appends(&version_info, get_zend_version());
 	smart_string_0(&version_info);
 
-	zend_string_free(os);
-	zend_string_free(os_version);
-
 	return version_info.c;
 }
 

main/php_main.h

@@ -89,13 +89,14 @@ PHPAPI bool php_tsrm_startup(void);
 #define PHP_OS_STR PHP_OS
 #endif
 
+#define _PHP_STRINGIFY(s) #s
+#define PHP_STRINGIFY(s) _PHP_STRINGIFY(s)
+
 #ifndef PHP_BUILD_COMPILER
 # if defined(__clang__)
-/* __VERSION__ contains the compiler name */
-#  define PHP_BUILD_COMPILER __VERSION__
+#  define PHP_BUILD_COMPILER "Clang " PHP_STRINGIFY(__clang_major__)
 # elif defined(__GNUC__)
-/* __VERSION__ does not contain the compiler name */
-#  define PHP_BUILD_COMPILER "GCC " __VERSION__
+#  define PHP_BUILD_COMPILER "GCC " PHP_STRINGIFY(__GNUC__)
 # endif
 #endif
 

win32/build/confutils.js

@@ -133,6 +133,8 @@ extension_module_ptrs = "";
 	var oss = wmiservice.ExecQuery("Select * from Win32_OperatingSystem");
 	var os = oss.ItemIndex(0);
 	AC_DEFINE("PHP_BUILD_SYSTEM", os.Caption + " [" + os.Version + "]", "The system that PHP was built on.");
+	AC_DEFINE("PHP_UNAME_S", os.Caption, "The system name that PHP was built on.");
+	AC_DEFINE("PHP_UNAME_R", os.Version, "The system version that PHP was built on.");
 	var build_provider = WshShell.Environment("Process").Item("PHP_BUILD_PROVIDER");
 	if (build_provider) {
 		AC_DEFINE("PHP_BUILD_PROVIDER", build_provider, "The PHP build provider information.");