summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-09-07 07:56:58 +0200
committerRemi Collet <remi@remirepo.net>2021-09-07 07:56:58 +0200
commit923b32d9acd8c42432c4268844f8a46407569c56 (patch)
tree75c695ed6c15aa3d880db926c1c2c2ef4e4226f3
parent447d786fc46ed273ccb39d0a4b00ec187ab00c76 (diff)
fix intl build on F35
-rw-r--r--php-7.1.33-intl.patch13
-rw-r--r--php.spec7
2 files changed, 19 insertions, 1 deletions
diff --git a/php-7.1.33-intl.patch b/php-7.1.33-intl.patch
new file mode 100644
index 0000000..961fd89
--- /dev/null
+++ b/php-7.1.33-intl.patch
@@ -0,0 +1,13 @@
+diff -up ./ext/intl/collator/collator_sort.c.old ./ext/intl/collator/collator_sort.c
+diff -up ./ext/intl/config.m4.old ./ext/intl/config.m4
+--- ./ext/intl/config.m4.old 2021-09-07 07:38:38.698104692 +0200
++++ ./ext/intl/config.m4 2021-09-07 07:38:42.909098288 +0200
+@@ -9,7 +9,7 @@ if test "$PHP_INTL" != "no"; then
+ 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 3219e0e..9f91fff 100644
--- a/php.spec
+++ b/php.spec
@@ -126,7 +126,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{rcver}}
-Release: 7%{?dist}
+Release: 8%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -160,6 +160,7 @@ Source52: 20-oci8.ini
# Build fixes
Patch1: php-7.1.7-httpd.patch
+Patch2: php-7.1.33-intl.patch
Patch5: php-7.2.0-includedir.patch
Patch6: php-5.6.3-embed.patch
Patch7: php-5.3.0-recode.patch
@@ -931,6 +932,7 @@ low-level PHP extension for the libsodium cryptographic library.
%endif
%patch1 -p1 -b .mpmcheck
+%patch2 -p1 -b .true
%patch5 -p1 -b .includedir
%patch6 -p1 -b .embed
%patch7 -p1 -b .recode
@@ -1936,6 +1938,9 @@ EOF
%changelog
+* Tue Sep 7 2021 Remi Collet <remi@remirepo.net> - 7.2.34-8
+- fix intl build on F35
+
* Wed Aug 25 2021 Remi Collet <remi@remirepo.net> - 7.2.34-7
- Fix #81211 Symlinks are followed when creating PHAR archive