php7: fix for icu 68.1

openwrt/packages#13883 php/php-src@8eaaabd Signed-off-by: Hirokazu MORIKAWA <[email protected]>
immortalwrt · Nov 14, 2020 · a10ccd9 · a10ccd9
1 parent 77ab6b5
commit a10ccd9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git 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 <[email protected]>
 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
@@ -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