From nobody Sun Sep 15 11:39:52 2024 X-Original-To: dev-commits-ports-all@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 4X65gX4L2Wz5WFYM; Sun, 15 Sep 2024 11:39:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X65gX2cQGz3x04; Sun, 15 Sep 2024 11:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726400392; 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=4SIEyl3pCh+RCmpoHNz1rVSIWBeorOXVN9SEa9kyKIw=; b=SzNZTF6+l8s/IAnHefIDLRZ/vIonVeGdnKP4Q6J2a44K4+Ffv5FS7IPKj4rOAoN1ZwOsJu mubX0bk7hNBip75UvsL6UgWg8Tqq3bGU6AnsWCcMX0xspJRu4BJAxhoCYjA70Wyl9Dzj0Y sXqeruSyvTZyoLQrqd7qgaYJthZOE34ndoIWevNsx0Nt/ZCZ3MQbjGpqx1G0XYDQbSHkEq sWlYduVje7bT2cNPc40/dLUFdQIGKI4Il95vC6z3HMJW/dQ4anvfY2DjizJhs+3qKKVzqu AHsutOzNPkKl038lhsSURYzKqSlccb5yf+0xdTN1owc9zeh34dMBtnXY/9j7Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726400392; a=rsa-sha256; cv=none; b=TB1vSoxhNvMWNyI0OspCiflY+1C/bKfFydeV0L9+yCAePVJiZZtxpwvL98D8hIKG4bgrqx 7oGbrL9jXPIOrqQ2/S2qs0UHW+GLUXmdbvIaTV6xfDR4MIvN/yZKBVCT+wkaVDY35yXCDR fvp6B75wmdYzmfdnRlBrAjvWSSG1edc25yXzVUHVfDNqz5IpdQMTn2jcJBlO6aesJlPkDV Mw0ArESZA7XdXGP3zOL86z3VRVY495SqcgReO5aTIRewsd+NSa5bMH8WUayJNhvOpTPSMb jinv/XllhDJ/UCa3tIPt7OGk3g2+VbdwTBUGuwPjuU6F86PsgNb4XpbI+eloRg== 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=1726400392; 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=4SIEyl3pCh+RCmpoHNz1rVSIWBeorOXVN9SEa9kyKIw=; b=Dk4Pq2RQvlOuxYkRi+da4KKFNeUBA8kM1P9A7peXDcVl6DWPrQRAJ5V3Y+ofWEUwuJ8DEa gDRZguVLQOeeAzQic63rgYIENsPLDfSvta2WK9T+bHRrHmM3uljIPDTLQapLQBnRMAuN+r ZiU5Yk8hU6TKtbBcW1YY7xTWsFyFrQJWqVZw2E2PUkyz2PYZ4ipI+Et/N55nQYq9nmNvS5 rus7EEUIzp4qbbE9q7NDHvvUTvx7rFppu/WtK5rz5vbZF72RE/bZGtX3Gry6OIbnVEuUbx Xur8flKUJn0GlouJNQDPa02Fi0h8PUsh3nUOk7Ocm5hvL4Vb3gj9EU2VGNBO3Q== 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 4X65gX1R1dz18Qx; Sun, 15 Sep 2024 11:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48FBdq80092621; Sun, 15 Sep 2024 11:39:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48FBdqFq092618; Sun, 15 Sep 2024 11:39:52 GMT (envelope-from git) Date: Sun, 15 Sep 2024 11:39:52 GMT Message-Id: <202409151139.48FBdqFq092618@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 59790923d575 - 2024Q3 - devel/folly: fix build with clang 19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 59790923d57507ffaabc71a94f6690959d0f2919 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=59790923d57507ffaabc71a94f6690959d0f2919 commit 59790923d57507ffaabc71a94f6690959d0f2919 Author: Dimitry Andric AuthorDate: 2024-09-14 16:37:22 +0000 Commit: Dimitry Andric CommitDate: 2024-09-15 11:39:37 +0000 devel/folly: fix build with clang 19 As noted in the libc++ 19 release notes [1], std::char_traits<> is now only provided for char, char8_t, char16_t, char32_t and wchar_t, and any instantiation for other types will fail. This causes devel/folly to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: /usr/include/c++/v1/string_view:300:42: error: implicit instantiation of undefined template 'std::char_traits' 300 | static_assert(is_same<_CharT, typename traits_type::char_type>::value, | ^ /wrkdirs/share/dim/ports/devel/folly/work/folly-2024.09.09.00/folly/io/Cursor.h:686:35: note: in instantiation of template class 'std::basic_string_view' requested here 686 | std::basic_string_view peekView() { | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ Since the peekView() function is supposed to return a no longer existing type, conditionalize it for libc++ versions before 19. As far as I can see, there are no consumers of this function, except for some of the tests. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals PR: 281499 Approved by: yuri (maintainer) MFH: 2024Q3 (cherry picked from commit b3459442f762df2cf1e81c582c78da1481c834f6) --- devel/folly/files/patch-folly_io_Cursor.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/devel/folly/files/patch-folly_io_Cursor.h b/devel/folly/files/patch-folly_io_Cursor.h new file mode 100644 index 000000000000..f79053c883bc --- /dev/null +++ b/devel/folly/files/patch-folly_io_Cursor.h @@ -0,0 +1,18 @@ +--- folly/io/Cursor.h.orig 2024-09-07 03:24:18 UTC ++++ folly/io/Cursor.h +@@ -677,6 +677,7 @@ class CursorBase { + return ByteRange{data(), available}; + } + ++#if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 190000 + /** + * Alternate version of peekBytes() that returns a std::basic_string_view + * instead of a ByteRage. +@@ -687,6 +688,7 @@ class CursorBase { + auto bytes = peekBytes(); + return {bytes.data(), bytes.size()}; + } ++#endif // _LIBCPP_VERSION < 190000 + + /** + * Alternate version of peekBytes() that returns a std::pair