Browse Source

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 <morikw2@gmail.com>
lilik-openwrt-22.03
Hirokazu MORIKAWA 4 years ago
parent
commit
fc9fa48973
2 changed files with 14 additions and 1 deletions
  1. +1
    -1
      lang/php7/Makefile
  2. +13
    -0
      lang/php7/patches/1005-support_for_icu4c_68_1.patch

+ 1
- 1
lang/php7/Makefile View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=php PKG_NAME:=php
PKG_VERSION:=7.4.12 PKG_VERSION:=7.4.12
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
PKG_LICENSE:=PHP-3.01 PKG_LICENSE:=PHP-3.01


+ 13
- 0
lang/php7/patches/1005-support_for_icu4c_68_1.patch View File

@ -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

Loading…
Cancel
Save