From nobody Fri Aug 02 22:24:55 2024 X-Original-To: dev-commits-ports-branches@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 4WbL474X1qz5RJgl; Fri, 02 Aug 2024 22:24:55 +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 4WbL473JsDz4b6f; Fri, 2 Aug 2024 22:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722637495; 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=5RJy7OuYOQBVa2FRESwuC5uPn2EFf+BUicy/mlCe9UE=; b=whYPj3RZvhwAHtN0lzkEbeFZt5bCaHE1YUboq2feSLg8BncxgwH+BaQMBCFYunAhASMQ+r ErEUlpfd8viQoiZEStVy/jrBnG1R/dW8FQs/YnpazIbJqekg6GYsPk/oLIFkBatbotVVrd 7ZW0S7WByyxqrQW3gBEd7gWBNDuB4vfLM98rWRDCzcARcPHKr7Ap68JD0/8zBmj+8GrBAk 2MyJHBSPL+ya2S5Ddqs7SZ+O+m0r0NW0XiTdVAhsbikWpgr0Ra0xFsAggnjAmpuORU8lMx cmQx/1DvDT8soDaOIQ4XGt0LVMrFk84//EDVGQXC1bzv+XEHk7livrGTLwNGww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722637495; a=rsa-sha256; cv=none; b=xHqretTnHbsSLGrkEGKdAXkhCQPbzEwC9vKasRmzu7IFmS0Ye0t6bZYU/Q3uqLaK0LmO2k jib0ZSli9uuA5I+nUBBhl6NW7rwtr47Y0PpYkSkAHWvg5QLisM3A7+hCeSoh0gbrxRRHOF HCEadxW+gu/kc9dtafwd4+IrRE6KeTz7lDZqBsTZPhghg0qxpJlWevXcK2k27cLczB0cbq 7gVXmLt/FC+C7qdJ0PJfMayj9rm1DJUKNjEb7rnuii67Z1r36lqhyqMuaUw7Or98zcYZHm 85iXBiMQ1ai3hSX5AS7oeel0s/chZOoLjW4HjLdVUs3r/QzhQzNQa3G2irMkcg== 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=1722637495; 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=5RJy7OuYOQBVa2FRESwuC5uPn2EFf+BUicy/mlCe9UE=; b=KpQXl1xd7Kx5XWg/nQY1/g3K+X2DpI0bV1AMCyKqIVsXjkGxTuw/nz2JTkf7h7ePDdrJU8 fPkAsWB1P7ONrrjxlrphLtFAV5H7hnnXDN+5zK820CCObXJon2UHt98FctMppZL3JUzXiJ 2re5fM2riqvSqJzTSn3iG3LIS2YSbCT8xNtV1qzM7gJXr/6CLU39l+yIw8uxRYARo2ZN8U Ro2L/7TOeMjsDDNIL7s0QuyGtJn3TDb6Spnyc+lsieTcVvEn+PXePe/KGnTdJ0FaGLhsAn SSWN57JWzPVC5nOVKTmWcRU2HmFpyYhrCHUUeUUQBJNUT7y86ov/uhAeON2gNw== 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 4WbL472w5Zzm7q; Fri, 2 Aug 2024 22:24:55 +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 472MOtI5065274; Fri, 2 Aug 2024 22:24:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 472MOt7U065271; Fri, 2 Aug 2024 22:24:55 GMT (envelope-from git) Date: Fri, 2 Aug 2024 22:24:55 GMT Message-Id: <202408022224.472MOt7U065271@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: dab5e4a7a05e - 2024Q3 - devel/llvm12: fix build with libc++ 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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: dab5e4a7a05e6c99781d7924a95c7aa3b4a95051 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=dab5e4a7a05e6c99781d7924a95c7aa3b4a95051 commit dab5e4a7a05e6c99781d7924a95c7aa3b4a95051 Author: Dimitry Andric AuthorDate: 2024-08-02 20:01:54 +0000 Commit: Dimitry Andric CommitDate: 2024-08-02 22:24:14 +0000 devel/llvm12: 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/llvm12 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/llvm12/work-default/llvm-project-12.0.1.src/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp:578: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 (cherry picked from commit 0626947ce16eeffc65226c508425601a04a6544b) --- devel/llvm12/files/patch-backport-68744ffbdd | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/devel/llvm12/files/patch-backport-68744ffbdd b/devel/llvm12/files/patch-backport-68744ffbdd new file mode 100644 index 000000000000..253e44a6ef6b --- /dev/null +++ b/devel/llvm12/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); + } + }