From nobody Fri Aug 02 22:04:11 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 4WbKcD2Btvz5RGn8; Fri, 02 Aug 2024 22:04:12 +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 4WbKcD13XWz4Y9T; Fri, 2 Aug 2024 22:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722636252; 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=O/hWrHmZ1iHdPi6XL+adLlj46DZ9EzoxgLEkU2YT7HM=; b=tNGFxx1UbgG8Y7hoyJaUa7UJIVs25NlvvoIwv4DnuBTSp1CKagsxlf+fgTbM06nvG1z84b FFL+yEAtWpujvajaHNxaZ3xFfupt/CGrKASkzPHza34glpchIyUSlthQRX/t9Jn5FQS8QR jjdy8IsRj1SiM67BngCBmXcUvwHF6hC8wff1qUaaRxDHULEfwvdHv68Cg6gUV10wBoY32/ SeWtalhKtnTRBwCp3RQ/Adi5pCBVKZLYeZsARbZslKKRpPiUTYzLXlFsU5iZ2qVHqnACkJ DnUwlFbKU9usjKrYzmQ89s/ZCI+oez26AhshMP334Aep6z2v5UVqjd13glMPeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722636252; a=rsa-sha256; cv=none; b=Y1w0gUtvpWe+/iem8+9WmVqwyxtt/VQlYeef+X3JRM5xiItL1GZeYsJlecx2mDHfOIjrFk oQZJvaROZt+2PxMjv0oPJDrO5uDf9pev7YGs/GSWxe1cpUIFljdg+b8a3GP9TdswyZW1Uk lnqFMnxe58HetbFLzBAoC38ngguH0xiL3gxGqGfhMoCDhHWCeS710RIqyHoW9SsuWbPWIt sLn1q6BakJ9gcxKOuz8m0yz/Cht/NLc4W2jU47+DPvIHAoha3l1v9r/Cv6rK/FjbWuhaQD 7UqceOLSWxgJgVMmXcxk4ThpTqfaQ/r+/IHiR55ZloAF4LbQw8FTn9DAlfMjHQ== 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=1722636252; 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=O/hWrHmZ1iHdPi6XL+adLlj46DZ9EzoxgLEkU2YT7HM=; b=GdHEhqWwkPpFINl0sahxS3KFLtwiGC+h2A1sig5bQHkaKMO1ffhxOjngHsvvbR4sgWVu7d 7aVSvds0J31ArvFSN4RdpoUtqgIwILNordbfHqV7rQbeeBj8QUIERpPwRHg8XKHtgcAWlx HtN3H2okLSa6qolE1vhVKGzFFdbYISj/VzsfLNSjUoVsBpCguVLD+jD3Bd+LTv6JyPDKe0 f6ia+WiToYuMg26V2Yy8UiFB5aDt+SQ5vYW68ltTzz/np+EhMgfR94IuwcBxwTLxiI8y6v yfvq6P+t3zvS7VUChXXzbcs2pEdRQzQbbLg77nO7fDZrcC8A2Mv3rTu3akv51w== 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 4WbKcD06hJzlw7; Fri, 2 Aug 2024 22:04:12 +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 472M4BfN030727; Fri, 2 Aug 2024 22:04:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 472M4BCd030724; Fri, 2 Aug 2024 22:04:11 GMT (envelope-from git) Date: Fri, 2 Aug 2024 22:04:11 GMT Message-Id: <202408022204.472M4BCd030724@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: 7624cbd8af77 - main - devel/llvm17: fix build with libc++ 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/main X-Git-Reftype: branch X-Git-Commit: 7624cbd8af7758af64631f04930089e13fb9fcf7 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=7624cbd8af7758af64631f04930089e13fb9fcf7 commit 7624cbd8af7758af64631f04930089e13fb9fcf7 Author: Dimitry Andric AuthorDate: 2024-08-02 12:42:16 +0000 Commit: Dimitry Andric CommitDate: 2024-08-02 21:59:07 +0000 devel/llvm17: 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/llvm17 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/llvm17/work-default/llvm-project-17.0.6.src/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp:634:34: note: in instantiation of template class 'std::basic_string' requested here 634 | 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/llvm17/Makefile | 1 + devel/llvm17/distinfo | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile index ee08a727c5f8..f907f6a1f575 100644 --- a/devel/llvm17/Makefile +++ b/devel/llvm17/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/llvm17/distinfo b/devel/llvm17/distinfo index 9b27c6ea150d..a3690faf6fce 100644 --- a/devel/llvm17/distinfo +++ b/devel/llvm17/distinfo @@ -1,6 +1,10 @@ -TIMESTAMP = 1701190197 +TIMESTAMP = 1722603078 SHA256 (llvm-project-17.0.6.src.tar.xz) = 58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813 SIZE (llvm-project-17.0.6.src.tar.xz) = 127838860 +SHA256 (llvmorg-18-init-1760-g68744ffbdd7d.patch) = ad9ad1613491f69b010dbbd6a9d90d5dd505e46d9537a6e533f36dacd552d0f7 +SIZE (llvmorg-18-init-1760-g68744ffbdd7d.patch) = 1491 +SHA256 (llvmorg-18-init-2919-g7549cde6bd52.patch) = 3c388e7c79949ba16f8587316cfb5ef7cd4c7e231941b3513e1950260a490e5f +SIZE (llvmorg-18-init-2919-g7549cde6bd52.patch) = 1737 SHA256 (llvmorg-18-init-15199-gb9935bb02a50.patch) = b0805cba765084c7bef426fa1235dd887c61ae0c1fd5e3fad5c8742cdd6ee8b0 SIZE (llvmorg-18-init-15199-gb9935bb02a50.patch) = 1893 SHA256 (llvmorg-18-init-15680-g966d564e43e6.patch) = 3abf92d4a788ff2f74fa9fc627a113f04d9fb72cd7e47344a8c4dce06140a163