From fc9fa489736ec602d7a5aa852c14f2004bb7fa27 Mon Sep 17 00:00:00 2001 From: Hirokazu MORIKAWA Date: Tue, 10 Nov 2020 18:13:16 +0900 Subject: [PATCH] php7: fix for icu 68.1 https://github.com/openwrt/packages/pull/13883 https://github.com/php/php-src/commit/8eaaabd Signed-off-by: Hirokazu MORIKAWA --- lang/php7/Makefile | 2 +- lang/php7/patches/1005-support_for_icu4c_68_1.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 lang/php7/patches/1005-support_for_icu4c_68_1.patch diff --git a/lang/php7/Makefile b/lang/php7/Makefile index d7e108367..1e8087f0b 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=7.4.12 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Michael Heimpold PKG_LICENSE:=PHP-3.01 diff --git a/lang/php7/patches/1005-support_for_icu4c_68_1.patch b/lang/php7/patches/1005-support_for_icu4c_68_1.patch new file mode 100644 index 000000000..040dc7776 --- /dev/null +++ b/lang/php7/patches/1005-support_for_icu4c_68_1.patch @@ -0,0 +1,13 @@ +--- a/build/php.m4 2020-10-28 00:01:52.000000000 +0900 ++++ b/build/php.m4 2020-11-13 08:57:27.939303216 +0900 +@@ -1907,6 +1907,10 @@ + if test "$PKG_CONFIG icu-io --atleast-version=60"; then + ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1" + fi ++ ++ if test "$PKG_CONFIG icu-io --atleast-version=68"; then ++ ICU_CFLAGS="$ICU_CFLAGS -DU_DEFINE_FALSE_AND_TRUE=1" ++ fi + ]) + + dnl