diff options
| author | Remi Collet <remi@remirepo.net> | 2023-02-28 12:12:18 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-02-28 12:12:18 +0100 |
| commit | a2b209b2c72fd10fc14541243e8e7160b2f724e2 (patch) | |
| tree | 0607e73c58ecbbbb6ff9dc0ce7c3ba05832e3e53 /phalcon-php82.patch | |
| parent | ce817763043c48f0a376a53e79bcd319ddccee46 (diff) | |
update to 5.2.0
fix License
add patch for https://github.com/phalcon/cphalcon/issues/16295
build failure on EL7 with 8.2, from
https://github.com/phalcon/cphalcon/pull/16296
Diffstat (limited to 'phalcon-php82.patch')
| -rw-r--r-- | phalcon-php82.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/phalcon-php82.patch b/phalcon-php82.patch new file mode 100644 index 0000000..9ba2843 --- /dev/null +++ b/phalcon-php82.patch @@ -0,0 +1,28 @@ +Partial fix taken from + + +From 2141babe8b5b00c34a8677489d673e7b322384ef Mon Sep 17 00:00:00 2001 +From: Anton Vasiliev <aionbase@gmail.com> +Date: Tue, 28 Feb 2023 10:07:02 +0000 +Subject: [PATCH 2/2] #16293 - Regenerate phalcon.zep.c + +--- + build/phalcon/phalcon.zep.c | 310572 +++++++++++++++++---------------- + 1 file changed, 155288 insertions(+), 155284 deletions(-) + +diff --git a/build/phalcon/phalcon.zep.c b/build/phalcon/phalcon.zep.c +index e56befbd5e3..ec2ab669faf 100644 +--- a/build/phalcon/phalcon.zep.c ++++ b/build/phalcon/phalcon.zep.c +@@ -82,6 +82,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include <ext/spl/spl_iterators.h> + #include <ext/spl/spl_array.h> + ++#if defined ZEPHIR_USE_PHP_PCRE && ZEPHIR_USE_PHP_PCRE ++#include <ext/pcre/php_pcre.h> ++#endif ++ + #include <ext/pdo/php_pdo_driver.h> + #include <ext/hash/php_hash.h> + #include <ext/date/php_date.h> + |