From c891bb332af826e14cfb28614b1b9fedf80ec47d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Sep 2020 14:46:18 +0200 Subject: update to 8.0.0beta3 bump ABI/API versions drop xmlrpc extension json is now build statically use system nikic/php-parser if available to generate C headers from PHP stub switch from "runselftest" option to bcond_without tests enchant: use libenchant-2 instead of libenchant rename 15-php.conf to 20-php.conf to ensure load order oci8 version is now 3.0.0 --- php-7.4.8-phpinfo.patch | 76 ------------------------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 php-7.4.8-phpinfo.patch (limited to 'php-7.4.8-phpinfo.patch') diff --git a/php-7.4.8-phpinfo.patch b/php-7.4.8-phpinfo.patch deleted file mode 100644 index 9b7175e..0000000 --- a/php-7.4.8-phpinfo.patch +++ /dev/null @@ -1,76 +0,0 @@ - -Drop "Configure Command" from phpinfo as it doesn't -provide any useful information. -The available extensions are not related to this command. - -diff -up a/ext/standard/info.c.phpinfo v/ext/standard/info.c ---- a/ext/standard/info.c.phpinfo 2015-08-18 23:39:24.000000000 +0200 -+++ b/ext/standard/info.c 2015-08-22 07:56:18.344761928 +0200 -@@ -809,9 +809,6 @@ PHPAPI void php_print_info(int flag) - #ifdef ARCHITECTURE - php_info_print_table_row(2, "Architecture", ARCHITECTURE); - #endif --#ifdef CONFIGURE_COMMAND -- php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); --#endif - - if (sapi_module.pretty_name) { - php_info_print_table_row(2, "Server API", sapi_module.pretty_name ); -diff -up a/ext/standard/tests/general_functions/phpinfo.phpt.phpinfo b/ext/standard/tests/general_functions/phpinfo.phpt ---- a/ext/standard/tests/general_functions/phpinfo.phpt.phpinfo 2015-08-18 23:39:22.000000000 +0200 -+++ b/ext/standard/tests/general_functions/phpinfo.phpt 2015-08-22 07:56:18.344761928 +0200 -@@ -20,7 +20,6 @@ PHP Version => %s - - System => %s - Build Date => %s%a --Configure Command => %s - Server API => Command Line Interface - Virtual Directory Support => %s - Configuration File (php.ini) Path => %s - - -Backported from 8.0: - -From ad0d2e438fddc089917e71e5d8909d145db9da8a Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 3 Jul 2020 10:08:09 +0200 -Subject: [PATCH] display info about system used to build and its provider - ---- - configure.ac | 5 +++++ - ext/standard/info.c | 6 ++++++ - 2 files changed, 11 insertions(+) - -diff --git a/configure.ac b/configure.ac -index d9e6329314a3..77f12a55569a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1328,6 +1328,11 @@ PHP_UNAME=${PHP_UNAME:-$UNAME} - AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) - PHP_OS=`uname | xargs` - AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) -+PHP_BUILD_SYSTEM=${PHP_BUILD_SYSTEM:-$PHP_UNAME} -+AC_DEFINE_UNQUOTED(PHP_BUILD_SYSTEM,"$PHP_BUILD_SYSTEM",[builder uname output]) -+if test -n "${PHP_BUILD_PROVIDER}"; then -+ AC_DEFINE_UNQUOTED(PHP_BUILD_PROVIDER,"$PHP_BUILD_PROVIDER",[build provider]) -+fi - - PHP_SUBST_OLD(PHP_INSTALLED_SAPIS) - -diff --git a/ext/standard/info.c b/ext/standard/info.c -index 262e95ae2731..f652efd23657 100644 ---- a/ext/standard/info.c -+++ b/ext/standard/info.c -@@ -803,6 +803,12 @@ PHPAPI ZEND_COLD void php_print_info(int flag) - php_info_print_table_start(); - php_info_print_table_row(2, "System", ZSTR_VAL(php_uname)); - php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__); -+#ifdef PHP_BUILD_SYSTEM -+ php_info_print_table_row(2, "Build System", PHP_BUILD_SYSTEM); -+#endif -+#ifdef PHP_BUILD_PROVIDER -+ php_info_print_table_row(2, "Build Provider", PHP_BUILD_PROVIDER); -+#endif - #ifdef COMPILER - php_info_print_table_row(2, "Compiler", COMPILER); - #endif -- cgit