From nobody Sat Apr 20 21:53:01 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VMQHK2pWmz5JX2T; Sat, 20 Apr 2024 21:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VMQHK1xHNz4cpw; Sat, 20 Apr 2024 21:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713649981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N9pu8OjkPvbJZ+skG63EitwSElD+jr9gco3qx4BhLYU=; b=KjNpxDCp1UsLNj0b3/7eOr7sZHDXfLWxcs8w4IOV0OycdFvvph/TARUb87Jn5tIp3VVrC0 pNYE8PWFpPpEhxmh49XZHAF6ofc5bWpRPQSPVib4OyIO/uaiXhb5ZjNHdjmF47KQtqoeIP xW0AqYLbpW5ZxdpjN/CbRsxKHedrAqh3YS8HSkt9dgwUV0/H7qg6a7Wlx7bSd/9MKBAp1a JzQPKCPO+xvBtNIlLRGWs37CSyRtrcroMMk4p8f8DXzCSBkp6M9qWtGl29186sDsR3Hbhp qK3EjhRkrGT748xjr1TlcAzIN3MVx1cR1FC6Ikw/zCwyg9ERdheVfilEzy5dDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713649981; a=rsa-sha256; cv=none; b=Dip6SN6QIdAZnWP0wzb1HCW6wnusQGu0ADian7IUEBwHxjpqjlF6Pt25DKpdVTGRtKQGV6 evztUT43Jzz54J0NS5EOV6T0EhsUH4olRF6gQFkx2kBtux17naTYsFKW3smOjKFRoM0rB/ q9js2wQcqoywYwja2I7qZSvThrZkT8kaXNoYGA5HgjOaFSJZbFpDpJ0D9Y4a9mLOtJFT0m aXwl7eHWicWLDlEm5nBkgnyzuXvGnoDr5yXBjQrYdL5p4yRdO/A9adFPXrWF6jQTyhnfv+ 35x0zSLBD2jRSc7o/ijoPh8A2iD0dbP2ItboSPIR4k/vABh/nXPr1ViHs8yzWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713649981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N9pu8OjkPvbJZ+skG63EitwSElD+jr9gco3qx4BhLYU=; b=eWAri6E23g63nh3u0SEX1bb+Dx9Z6ujnQ06eoT3hbROfNuqFK/Ly4kvd7vRETzYLU4kbLQ Y6lvODfJ63ma4vh8qj2ejTjecLzKX9WAQRXTdk8+9m2Uhqr1zW0tLsp+YicS80/hkPvmR2 N3Qk4lf3Sk/+pPBaNvf6Aa38FwK4/XQ+yUn84b8npa/B9q0kPXrpZcLHjn0QBimNQ3JtFN TbwR6NjcvQisbKPyUhz/lJufJJG+pM6bfSxsr6AvXRVSzLSxOZc2RodNymoQFs4o0QZub7 7IMHMvz/x+bp/1NZ+5yiczZRawluBdUdUnXXQCER3eoysh1h8rVOFDS5MMF/kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMQHK1Y1KztxL; Sat, 20 Apr 2024 21:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43KLr1Pe074848; Sat, 20 Apr 2024 21:53:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KLr1kq074845; Sat, 20 Apr 2024 21:53:01 GMT (envelope-from git) Date: Sat, 20 Apr 2024 21:53:01 GMT Message-Id: <202404202153.43KLr1kq074845@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: e680bd98d34a - main - devel/php*-intl: unbreak build with ICU 75 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e680bd98d34a86302db434c5be23d0cf9d23df23 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e680bd98d34a86302db434c5be23d0cf9d23df23 commit e680bd98d34a86302db434c5be23d0cf9d23df23 Author: Jan Beich AuthorDate: 2024-04-20 21:49:22 +0000 Commit: Jan Beich CommitDate: 2024-04-20 21:52:00 +0000 devel/php*-intl: unbreak build with ICU 75 In file included from ext/intl/intl_convertcpp.cpp:17: In file included from ./intl_convertcpp.h:22: In file included from /usr/local/include/unicode/unistr.h:39: /usr/local/include/unicode/stringpiece.h:133:29: error: no template named 'enable_if_t' in namespace 'std' typename = std::enable_if_t< ~~~~~^ /usr/local/include/unicode/stringpiece.h:134:23: error: no template named 'is_same_v' in namespace 'std'; did you mean 'is_same'? (std::is_same_v ~~~~~^ /usr/include/c++/v1/__type_traits/is_same.h:22:29: note: 'is_same' declared here struct _LIBCPP_TEMPLATE_VIS is_same : _BoolConstant<__is_same(_Tp, _Up)> { }; ^ In file included from ext/intl/intl_convertcpp.cpp:17: In file included from ./intl_convertcpp.h:22: In file included from /usr/local/include/unicode/unistr.h:39: /usr/local/include/unicode/stringpiece.h:139:17: error: use of address-of-label extension outside of a function body std::is_same_v>> ^ /usr/local/include/unicode/stringpiece.h:139:62: error: expected member name or ';' after declaration specifiers std::is_same_v>> ^ PR: 278420 Reported by: antoine (via exp-run) --- devel/php81-intl/Makefile | 1 + devel/php81-intl/files/patch-config.m4 | 22 ++++++++++++++++++++++ devel/php82-intl/Makefile | 2 +- devel/php82-intl/files/patch-config.m4 | 22 ++++++++++++++++++++++ devel/php83-intl/Makefile | 2 +- devel/php83-intl/files/patch-config.m4 | 22 ++++++++++++++++++++++ 6 files changed, 69 insertions(+), 2 deletions(-) diff --git a/devel/php81-intl/Makefile b/devel/php81-intl/Makefile index 1ccc80b52ca4..9b26b350679d 100644 --- a/devel/php81-intl/Makefile +++ b/devel/php81-intl/Makefile @@ -1,3 +1,4 @@ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php81 diff --git a/devel/php81-intl/files/patch-config.m4 b/devel/php81-intl/files/patch-config.m4 new file mode 100644 index 000000000000..e78dbf7844e7 --- /dev/null +++ b/devel/php81-intl/files/patch-config.m4 @@ -0,0 +1,22 @@ +https://github.com/php/php-src/commit/037855fcd3f2 + +--- config.m4.orig 2024-04-09 18:46:23 UTC ++++ config.m4 +@@ -80,7 +80,16 @@ if test "$PHP_INTL" != "no"; then + breakiterator/codepointiterator_methods.cpp" + + PHP_REQUIRE_CXX() +- PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) ++ ++ AC_MSG_CHECKING([if intl requires -std=gnu++17]) ++ AS_IF([test "$PKG_CONFIG icu-uc --atleast-version=74"],[ ++ AC_MSG_RESULT([yes]) ++ PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX) ++ ],[ ++ AC_MSG_RESULT([no]) ++ PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) ++ ]) ++ + PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS" + case $host_alias in + *cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L" diff --git a/devel/php82-intl/Makefile b/devel/php82-intl/Makefile index 345c2d19f89c..ee29a2235e91 100644 --- a/devel/php82-intl/Makefile +++ b/devel/php82-intl/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php82 diff --git a/devel/php82-intl/files/patch-config.m4 b/devel/php82-intl/files/patch-config.m4 new file mode 100644 index 000000000000..e78dbf7844e7 --- /dev/null +++ b/devel/php82-intl/files/patch-config.m4 @@ -0,0 +1,22 @@ +https://github.com/php/php-src/commit/037855fcd3f2 + +--- config.m4.orig 2024-04-09 18:46:23 UTC ++++ config.m4 +@@ -80,7 +80,16 @@ if test "$PHP_INTL" != "no"; then + breakiterator/codepointiterator_methods.cpp" + + PHP_REQUIRE_CXX() +- PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) ++ ++ AC_MSG_CHECKING([if intl requires -std=gnu++17]) ++ AS_IF([test "$PKG_CONFIG icu-uc --atleast-version=74"],[ ++ AC_MSG_RESULT([yes]) ++ PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX) ++ ],[ ++ AC_MSG_RESULT([no]) ++ PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) ++ ]) ++ + PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS" + case $host_alias in + *cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L" diff --git a/devel/php83-intl/Makefile b/devel/php83-intl/Makefile index 347b1c99552a..fa5f5245ebaf 100644 --- a/devel/php83-intl/Makefile +++ b/devel/php83-intl/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php83 diff --git a/devel/php83-intl/files/patch-config.m4 b/devel/php83-intl/files/patch-config.m4 new file mode 100644 index 000000000000..e78dbf7844e7 --- /dev/null +++ b/devel/php83-intl/files/patch-config.m4 @@ -0,0 +1,22 @@ +https://github.com/php/php-src/commit/037855fcd3f2 + +--- config.m4.orig 2024-04-09 18:46:23 UTC ++++ config.m4 +@@ -80,7 +80,16 @@ if test "$PHP_INTL" != "no"; then + breakiterator/codepointiterator_methods.cpp" + + PHP_REQUIRE_CXX() +- PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) ++ ++ AC_MSG_CHECKING([if intl requires -std=gnu++17]) ++ AS_IF([test "$PKG_CONFIG icu-uc --atleast-version=74"],[ ++ AC_MSG_RESULT([yes]) ++ PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX) ++ ],[ ++ AC_MSG_RESULT([no]) ++ PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) ++ ]) ++ + PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS" + case $host_alias in + *cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L"