commit: 7b878520dc290dfc30177193882ac622ad99c799 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sun Dec 20 22:11:03 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sun Dec 20 22:11:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b878520
dev-lang/php: allow building against >=dev-lilbs/icu-68.1 Upstream's official solution is to restore previous ICU behavior using -DU_DEFINE_FALSE_AND_TRUE=1 [Link 1]. But this patch alone is not enough for PHP 7.2. However, PHP 7.2 has reached EOL so we will do same like upstream but via global {C,CXX}FLAGS. Link 1: https://github.com/php/php-src/commit/8eaaabdd58a395853d3658418622ee24635cb871 Closes: https://bugs.gentoo.org/759352 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> dev-lang/php/php-7.2.34.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-lang/php/php-7.2.34.ebuild b/dev-lang/php/php-7.2.34.ebuild index 07f0645b8d8..b7fe1520efb 100644 --- a/dev-lang/php/php-7.2.34.ebuild +++ b/dev-lang/php/php-7.2.34.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit flag-o-matic systemd autotools +inherit flag-o-matic systemd autotools toolchain-funcs DESCRIPTION="The PHP language runtime engine" HOMEPAGE="https://www.php.net/" @@ -239,6 +239,10 @@ src_configure() { addpredict /usr/share/snmp/mibs/.index #nowarn addpredict /var/lib/net-snmp/mib_indexes #nowarn + # Fix building against >=ICU-68, https://bugs.php.net/80310 + append-cflags -DU_DEFINE_FALSE_AND_TRUE=1 + append-cxxflags -DU_DEFINE_FALSE_AND_TRUE=1 + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" # The php-fpm config file wants localstatedir to be ${EPREFIX}/var