From nobody Fri Aug 02 22:04:16 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 4WbKcJ5Q78z5RGl5; Fri, 02 Aug 2024 22:04:16 +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 4WbKcJ3jqMz4YB4; Fri, 2 Aug 2024 22:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722636256; 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=mhfQirWB8uOR2fC1rYZuPAVs0xnK+Fubu0E4G8h6qKc=; b=bRTJM07rf+ZAcxZ3Hdxpp7y4Wd36y3NxitCf1TAZx9M+Q9G9qS5W2j7yVgfvTI30PfVSO/ 1TzmH3YkOGrIhbAOC2I7cq4qtJBmIyROp5yyl1sIn3l94cQ2u3knBnrqFiGVWr3jaGjPtv OO2/Ni/YfiezvdxuzEybAUcy9KIRtVMBlpQSsNXMBwJgDAKUFOmigMRtWnt1+iqz4hLz9e Wr4F8wZnxZSvlDC137R8TK5xOddXoPbqL/Yv8p+TjiACFRNA3maTh6b7BLA4E3x04FWZms jm7VWT+N3EFPAArtUUvBCFbZPifFd6xJchvADktqdiUnK3y79ZZfRDJ4Ei9dyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722636256; a=rsa-sha256; cv=none; b=npJNPUiCZxFnEXs4dGAyti+siA2SIRBJK63wrigkk9vI98eCUR+79+WksXZ31HdsfRSvWK CtJGbV3th3WtWvyq8ndFTFkOKpM7q748IOvvs/Ca/x3Ttt9mCM6rs5ZtgXyLM+E827SnoT 12NUuvK/7C+c0UHiaK798SMh2CVW+xefLRFCBGaStv+NkSNa/OtLAN9qXdKmQftCLwwFEF 9YJBhafNYUcuo53WQw4p7rxuc8oBZGpsaqKZRC1wivAySNbqZnLgmrvaIMlqUBsjRNDqNa 7G6PM20MZ3m7SXXDtv3vmQgp24cElDcafAIY84He+joVfksrcFsBRqncl5oguA== 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=1722636256; 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=mhfQirWB8uOR2fC1rYZuPAVs0xnK+Fubu0E4G8h6qKc=; b=Tq/veeaWEagr6ULYAxOfAFQ0JptaWtD6IkihakoRJ8+QWCVy/JWuRQtTex6I9IttozcLFi MTDsnQU6HWclAGbQH+BE7DOy5EFHDmhy1lGn0h83H7nqxevbxlMj+0q0KKXFCwRuy2Wg4d VunEhsUyXu0gnL/eonaLIF7dqbwBLNGjcLE6diKdZRf/tFpX0impsjXxTmUMlsZyFC6efK L+YBIK3LQZ/Kfi/kK+g/l5HPhy/q/0BbWRpPBaoFuBYu7LZr49c0VvNIA24OXXuo1kchF5 FgBXRrT6hCXWk4JnnRPbzMaB3Z6SaO6hnX8lvU1Q6M/1Y4WE+P/tZShFyIgdUw== 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 4WbKcJ3HMQzlFm; Fri, 2 Aug 2024 22:04:16 +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 472M4G6F030930; Fri, 2 Aug 2024 22:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 472M4GGR030927; Fri, 2 Aug 2024 22:04:16 GMT (envelope-from git) Date: Fri, 2 Aug 2024 22:04:16 GMT Message-Id: <202408022204.472M4GGR030927@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 2643a65e5d47 - main - devel/llvm13: fix build with libc++ 19 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2643a65e5d4700feaae78bfafe8bf9ab9b37f03c Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=2643a65e5d4700feaae78bfafe8bf9ab9b37f03c commit 2643a65e5d4700feaae78bfafe8bf9ab9b37f03c Author: Dimitry Andric AuthorDate: 2024-08-02 19:59:56 +0000 Commit: Dimitry Andric CommitDate: 2024-08-02 22:01:29 +0000 devel/llvm13: fix build with libc++ 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/llvm13 to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: /usr/include/c++/v1/string:820:42: error: implicit instantiation of undefined template 'std::char_traits' 820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value, | ^ /wrkdirs/usr/ports/devel/llvm13/work-default/llvm-project-13.0.1.src/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp:595:34: note: in instantiation of template class 'std::basic_string' requested here 638 | std::basic_string zeros(reg_info.byte_size, '\0'); | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ Upstream llvm has fixed this in commit 68744ffbdd7d [2], so add this as a backported patch file. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals [2] https://github.com/llvm/llvm-project/commit/68744ffbdd7d PR: 280579 Approved by: brooks (maintainer) MFH: 2024Q3 --- devel/llvm13/files/patch-backport-68744ffbdd | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/devel/llvm13/files/patch-backport-68744ffbdd b/devel/llvm13/files/patch-backport-68744ffbdd new file mode 100644 index 000000000000..253e44a6ef6b --- /dev/null +++ b/devel/llvm13/files/patch-backport-68744ffbdd @@ -0,0 +1,29 @@ +commit 68744ffbdd7daac41da274eef9ac0d191e11c16d +Author: Martin Storsjö +Date: 2023-08-10T11:09:36+03:00 + + [lldb] Fix building with latest libc++ + + Since https://reviews.llvm.org/D157058 in libc++, + the base template for char_traits has been removed - it is only + provided for char, wchar_t, char8_t, char16_t and char32_t. + (Thus, to use basic_string with a type other than those, we'd need + to supply suitable traits ourselves.) + + For this particular use, a vector works just as well as basic_string. + + Differential Revision: https://reviews.llvm.org/D157589 + +diff --git lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp +index 4efc454967a1..f9d95fc5d2a6 100644 +--- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp ++++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp +@@ -631,7 +631,7 @@ static void WriteRegisterValueInHexFixedWidth( + } else { + // Zero-out any unreadable values. + if (reg_info.byte_size > 0) { +- std::basic_string zeros(reg_info.byte_size, '\0'); ++ std::vector zeros(reg_info.byte_size, '\0'); + AppendHexValue(response, zeros.data(), zeros.size(), false); + } + }