Use target host information; shorten output

Author: arnaud-lb

configure.ac

@@ -1412,16 +1412,6 @@ 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.])
 
@@ -1447,6 +1437,11 @@ AS_VAR_IF([PHP_BUILD_ARCH],,,
   [AC_DEFINE_UNQUOTED([PHP_BUILD_ARCH], ["$PHP_BUILD_ARCH"],
     [The build architecture.])])
 
+AC_ARG_VAR([PHP_BUILD_OS], [The build OS])
+AS_VAR_IF([PHP_BUILD_OS],,,
+  [AC_DEFINE_UNQUOTED([PHP_BUILD_OS], ["$PHP_BUILD_OS"],
+    [The build OS.])])
+
 PHP_SUBST([PHP_FASTCGI_OBJS])
 PHP_SUBST([PHP_SAPI_OBJS])
 PHP_SUBST([PHP_BINARY_OBJS])

main/main.c

@@ -138,23 +138,18 @@ PHPAPI char *php_get_version(sapi_module_struct *sapi_module)
 #endif
 #ifdef PHP_BUILD_ARCH
 		" " PHP_BUILD_ARCH
-#else
-		" Unknown arch"
 #endif
-	);
-	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
+#ifdef PHP_BUILD_OS
+		" " PHP_BUILD_OS
 #endif
 #ifdef PHP_BUILD_COMPILER
-		" (" PHP_BUILD_COMPILER ")"
-#else
-		""
+		" " PHP_BUILD_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);
 

main/php_main.h

@@ -110,6 +110,24 @@ PHPAPI bool php_tsrm_startup(void);
 # endif
 #endif
 
+#ifndef PHP_BUILD_OS
+# if defined(PHP_WIN32)
+#  define PHP_BUILD_OS "WINNT"
+# elif defined(__APPLE__)
+#  define PHP_BUILD_OS "Darwin"
+# elif defined(__linux__)
+#  define PHP_BUILD_OS "Linux"
+# elif defined(__FreeBSD__)
+#  define PHP_BUILD_OS "FreeBSD"
+# elif defined(__NetBSD__)
+#  define PHP_BUILD_OS "NetBSD"
+# elif defined(__OpenBSD__)
+#  define PHP_BUILD_OS "OpenBSD"
+#elif defined(__sun__)
+#  define PHP_BUILD_OS "Solaris"
+# endif
+#endif
+
 END_EXTERN_C()
 
 #endif

win32/build/confutils.js

@@ -133,8 +133,6 @@ 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.");