From 5568e6e5cab72a5720690db72ac4d5ae725c22cc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 7 Sep 2021 08:02:35 +0200 Subject: fix intl build on F35 --- php-7.0.31-icu62.patch | 2 +- php.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/php-7.0.31-icu62.patch b/php-7.0.31-icu62.patch index 50ec038..f65271c 100644 --- a/php-7.0.31-icu62.patch +++ b/php-7.0.31-icu62.patch @@ -571,7 +571,7 @@ index e8428e1cbbe8..52408f8e9183 100644 PHP_SETUP_ICU(INTL_SHARED_LIBADD) PHP_SUBST(INTL_SHARED_LIBADD) PHP_REQUIRE_CXX() -+ INTL_COMMON_FLAGS="$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" ++ INTL_COMMON_FLAGS="$ICU_INCS -Wno-write-strings -DU_DEFINE_FALSE_AND_TRUE=1 -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" if test "$icu_version" -ge "4002"; then icu_spoof_src=" spoofchecker/spoofchecker_class.c \ spoofchecker/spoofchecker.c\ diff --git a/php.spec b/php.spec index 9daabd6..48b9dc9 100644 --- a/php.spec +++ b/php.spec @@ -127,7 +127,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?rcver:~%{rcver}} -Release: 29%{?dist} +Release: 30%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -2002,6 +2002,9 @@ EOF %changelog +* Tue Sep 7 2021 Remi Collet - 7.0.33-30 +- fix intl build on F35 + * Thu Aug 26 2021 Remi Collet - 7.0.33-29 - Fix #81211 Symlinks are followed when creating PHAR archive -- cgit