diff options
| -rw-r--r-- | php-8.0.0-phpinfo.patch | 88 | ||||
| -rw-r--r-- | php.spec | 5 |
2 files changed, 85 insertions, 8 deletions
diff --git a/php-8.0.0-phpinfo.patch b/php-8.0.0-phpinfo.patch index e86af79..391d996 100644 --- a/php-8.0.0-phpinfo.patch +++ b/php-8.0.0-phpinfo.patch @@ -5,12 +5,86 @@ The available extensions are not related to this command. Replace full GCC name by gcc in php -v output + +Also apply + +From 9bf43c45908433d382f0499d529849172d0d8206 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 28 Dec 2020 08:33:09 +0100 +Subject: [PATCH] rename COMPILER and ARCHITECTURE macro (too generic) + +--- + configure.ac | 4 ++-- + ext/standard/info.c | 8 ++++---- + sapi/cli/php_cli.c | 8 ++++---- + win32/build/confutils.js | 10 +++++----- + 4 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9d9c8b155b07..143dc061346b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1289,10 +1289,10 @@ if test -n "${PHP_BUILD_PROVIDER}"; then + AC_DEFINE_UNQUOTED(PHP_BUILD_PROVIDER,"$PHP_BUILD_PROVIDER",[build provider]) + fi + if test -n "${PHP_BUILD_COMPILER}"; then +- AC_DEFINE_UNQUOTED(COMPILER,"$PHP_BUILD_COMPILER",[used compiler for build]) ++ AC_DEFINE_UNQUOTED(PHP_BUILD_COMPILER,"$PHP_BUILD_COMPILER",[used compiler for build]) + fi + if test -n "${PHP_BUILD_ARCH}"; then +- AC_DEFINE_UNQUOTED(ARCHITECTURE,"$PHP_BUILD_ARCH",[build architecture]) ++ AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture]) + fi + + PHP_SUBST_OLD(PHP_INSTALLED_SAPIS) +diff --git a/ext/standard/info.c b/ext/standard/info.c +index 153cb6cde014..8ceef31d9fe4 100644 +--- a/ext/standard/info.c ++++ b/ext/standard/info.c +@@ -798,11 +798,11 @@ PHPAPI ZEND_COLD void php_print_info(int flag) + #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); ++#ifdef PHP_BUILD_COMPILER ++ php_info_print_table_row(2, "Compiler", PHP_BUILD_COMPILER); + #endif +-#ifdef ARCHITECTURE +- php_info_print_table_row(2, "Architecture", ARCHITECTURE); ++#ifdef PHP_BUILD_ARCH ++ php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH); + #endif + #ifdef CONFIGURE_COMMAND + php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); +diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c +index 5092fb0ffd68..9d296acec631 100644 +--- a/sapi/cli/php_cli.c ++++ b/sapi/cli/php_cli.c +@@ -640,12 +640,12 @@ static int do_cli(int argc, char **argv) /* {{{ */ + #else + "NTS " + #endif +-#ifdef COMPILER +- COMPILER ++#ifdef PHP_BUILD_COMPILER ++ PHP_BUILD_COMPILER + " " + #endif +-#ifdef ARCHITECTURE +- ARCHITECTURE ++#ifdef PHP_BUILD_ARCH ++ PHP_BUILD_ARCH + " " + #endif + #if ZEND_DEBUG + diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c --- ./ext/standard/info.c.phpinfo 2020-07-21 10:49:31.000000000 +0200 +++ ./ext/standard/info.c 2020-07-21 11:41:56.295633523 +0200 @@ -804,9 +804,6 @@ PHPAPI ZEND_COLD void php_print_info(int - #ifdef ARCHITECTURE - php_info_print_table_row(2, "Architecture", ARCHITECTURE); + #ifdef PHP_BUILD_ARCH + php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH); #endif -#ifdef CONFIGURE_COMMAND - php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); @@ -32,13 +106,13 @@ diff -up ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/stand diff -up ./sapi/cli/php_cli.c.phpinfo ./sapi/cli/php_cli.c --- ./sapi/cli/php_cli.c.phpinfo 2020-07-21 11:43:38.812475300 +0200 +++ ./sapi/cli/php_cli.c 2020-07-21 11:43:45.783464540 +0200 -@@ -643,8 +643,7 @@ static int do_cli(int argc, char **argv) +@@ -641,8 +641,7 @@ static int do_cli(int argc, char **argv) "NTS " #endif - #ifdef COMPILER -- COMPILER + #ifdef PHP_BUILD_COMPILER +- PHP_BUILD_COMPILER - " " + "gcc " #endif - #ifdef ARCHITECTURE - ARCHITECTURE + #ifdef PHP_BUILD_ARCH + PHP_BUILD_ARCH @@ -109,7 +109,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -1807,6 +1807,9 @@ fi %changelog +* Tue Jan 5 2021 Remi Collet <remi@remirepo.net> - 8.0.1~RC1-2 +- test build for new upstream patch (from 8.1) + * Tue Dec 15 2020 Remi Collet <remi@remirepo.net> - 8.0.1~RC1-1 - update to 8.0.1RC1 |