From nobody Fri Aug 02 22:04:13 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 4WbKcF1jQsz5RGsc; Fri, 02 Aug 2024 22:04:13 +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 4WbKcF1C0wz4YGK; Fri, 2 Aug 2024 22:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722636253; 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=AKVOHs208UNELonQ06BebGDR8CYbxwfXkXtWpeZthQY=; b=ATObBK6iHpxPI7exfscL8beOucDynWEo6fU50JwHQ+RhEY9d+AP+Iau/aiOyU08jz1Gkdv 3VZ0hqSa6ccosrguyer6JPLlOVMN+ku/n3bg6R1yCD3fGgByGNGBp7eMgtbPkotH0DtJ4/ Fkwzyt6iOPWXx0QvS03UOpiACUpWEYYEBALaDnlpwgx7ZICtrpgfRpj0WKdeiRc/0xYYhx PuIQglu3tWR3B/bJ28xbzkFFIGYAOZTzcIZIOCKPj2oxObyorAd/7KQFF2yaqf5BFuJE6B jzLmOHXmtgJveEoRqdD/dnVFmIHZXtGzQFYIhUaIhC1hQWHk4sPBESYgQKjUwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722636253; a=rsa-sha256; cv=none; b=ZFsSiX2zEE+mC3UV9JUZwXpCPsqMc+dPgdOvD/cG2hoEq0Nw0SByXx9xLV2xH1l5D8ukfn 8ZA9TBEuZYFEkGUKE9uj/tqYeYp+1R5HgN1JKNHYRfjxePlMdZ6je0JhTgFPsetGo4mewb xyKagJv18RczI+MvldcchRS7oN9k8CABdErvtPFz1vXKBBeDQ/cqsK3FD8GJSFydV938nT LLbONLufZ/VMn1E1FBbSevJh/sZStA/Zjq0M57HOQk3zISQFGlQWFskkUNezqlnwMDPiuM eG/regsqSeI4KAh4mChoyeGX5ZFPyyQrKqwZoSoUbLnJyARgSYDgo/P71ZDcrw== 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=1722636253; 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=AKVOHs208UNELonQ06BebGDR8CYbxwfXkXtWpeZthQY=; b=GHCRyqpuJtaywmezXPvo87vn3OOCsWCEaxxZhNAvmsSWW8l6lSKCSxMLDBbVO2FXBpYG0W RJOEJM57BEVMD7MTVF0YHr+ll46leVd1P1AJorJ8yv9K46QvdQ1SP0hGBLlqLIxmhG4bf1 CKpOovE41boWcJ1b3FdFMy3voEY1NhIzt4Nk2xsJyHWmIP0rRmG6/EpqhMdmblRtLFxt55 N6nXXDhkDAv7upOFglV0v2tvjszOU8XglR8akXXoxnZAdqmsVpWCBfihjjEGcH1ut4BBmb +gsTs5ehFCMVuHrTBxEMNUeRnXYI8l5fM6Tq1uDqfWbm/5pRRz/nAxYDN8wQCQ== 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 4WbKcF0p4Jzm18; Fri, 2 Aug 2024 22:04:13 +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 472M4DS0030777; Fri, 2 Aug 2024 22:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 472M4DWO030774; Fri, 2 Aug 2024 22:04:13 GMT (envelope-from git) Date: Fri, 2 Aug 2024 22:04:13 GMT Message-Id: <202408022204.472M4DWO030774@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: 4c6d856c838f - main - devel/llvm16: 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: 4c6d856c838f3e5edffd0d3ed01983d924907799 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c6d856c838f3e5edffd0d3ed01983d924907799 commit 4c6d856c838f3e5edffd0d3ed01983d924907799 Author: Dimitry Andric AuthorDate: 2024-08-02 19:37:01 +0000 Commit: Dimitry Andric CommitDate: 2024-08-02 22:00:31 +0000 devel/llvm16: 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/llvm16 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/llvm16/work-default/llvm-project-16.0.6.src/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp:636:34: note: in instantiation of template class 'std::basic_string' requested here 636 | 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 PATCHFILES entry in the Makefile. [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/llvm16/Makefile | 1 + devel/llvm16/distinfo | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index fa655ef715e1..d04686f98467 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -9,6 +9,7 @@ DISTNAME= llvm-project-${DISTVERSION}.src DISTFILES= llvm-project-${DISTVERSION}.src${EXTRACT_SUFX} PATCH_SITES= https://github.com/llvm/llvm-project/commit/ +PATCHFILES+= llvmorg-18-init-1760-g68744ffbdd7d.patch:-p1 # https://reviews.llvm.org/D157589 PATCHFILES+= llvmorg-18-init-15199-gb9935bb02a50.patch:-p1 # https://github.com/llvm/llvm-project/pull/75748 PATCHFILES+= llvmorg-18-init-15680-g966d564e43e6.patch:-p1 # https://github.com/llvm/llvm-project/pull/76185 diff --git a/devel/llvm16/distinfo b/devel/llvm16/distinfo index e7394a506f14..9cf157883e23 100644 --- a/devel/llvm16/distinfo +++ b/devel/llvm16/distinfo @@ -1,6 +1,8 @@ -TIMESTAMP = 1686758340 +TIMESTAMP = 1722603709 SHA256 (llvm-project-16.0.6.src.tar.xz) = ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e SIZE (llvm-project-16.0.6.src.tar.xz) = 118013488 +SHA256 (llvmorg-18-init-1760-g68744ffbdd7d.patch) = ad9ad1613491f69b010dbbd6a9d90d5dd505e46d9537a6e533f36dacd552d0f7 +SIZE (llvmorg-18-init-1760-g68744ffbdd7d.patch) = 1491 SHA256 (llvmorg-18-init-15199-gb9935bb02a50.patch) = b0805cba765084c7bef426fa1235dd887c61ae0c1fd5e3fad5c8742cdd6ee8b0 SIZE (llvmorg-18-init-15199-gb9935bb02a50.patch) = 1893 SHA256 (llvmorg-18-init-15680-g966d564e43e6.patch) = 3abf92d4a788ff2f74fa9fc627a113f04d9fb72cd7e47344a8c4dce06140a163