From nobody Fri Aug 02 22:24:51 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 4WbL445SfHz5RJjG; Fri, 02 Aug 2024 22:24: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 4WbL440QYbz4bYj; Fri, 2 Aug 2024 22:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722637492; 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=BFyLN1ErFi2q2s4YV/zZ8aDe/U9r8IYwO0UTxcRQeB8=; b=vp3Jxp1uYBqfwnwxndR+m8qZPkcdnJjm04xXPRhGRde7yvnhWr6q8k8c+mMcjfVTX8TJnC 5o3wJkl8bmgKuqLqZedISi2ZdEjZxjgCIuiThbKHYRZ+Fr9TCawmaM9SBBCbixS+kfvQCq HLyXvUcL7sG/EGKjt+aSD6ehGtVBc6vUcAG206yFKEtK3cidN9eyhpYoJLSnrYe7G9hFmF 5P4KDFnv5hANrBOM5kKp/0F/cXfwaq1mBbef/LhwtOY+l6t7cY9wV2Y2xuVsWEHr7j2TFc A6jXD7zS3r4nnaFzv42JmNwbDr97fKilehyyo2R5AWLSFkwO66grL0+DZXJO+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722637492; a=rsa-sha256; cv=none; b=l9p9QycPgmFQ6HVhS9DlJgXPjEWzRYYm/zH2pT/kmKbus7pTjuZGUPVY7dMCh2qawUpp4e cXQ6F9ZMwqS61Lr4xy149N9ck617LyqKsQndaoC4CI3xPVQjrQo5R5+OrGCymr2aOq80Y2 k3mMGKJXbbbbSBs0aGu3DH19VMTHEZtaBD4m5RTKmwU2A2nDtN9SG7aOqCQT8aYxWcG+YH 2bo0V1yxcHR+vrvp6josSKDhmsG2VTnmHZ34AMkniDrUeVexluxONbyc8gURHSTSp7T9VO hvyctHeDk0u1JjxPCcQPegCtwc1BSTbcWwFwO7/o0uMr1GXns2tPcyaF8auM6Q== 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=1722637492; 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=BFyLN1ErFi2q2s4YV/zZ8aDe/U9r8IYwO0UTxcRQeB8=; b=kFLdrO0o1tBw6TobV1K0Lc0Vi/LH8NumUmbRWamo4LNnYoOxyNn5jgRVdu/i3jG7qAFeRs 3a9UbteAt+dl3iDZfOmcFDSUGynks1y3zhE7Si3xKXf3pl78qEF7j2QG/vzMcoEkZBTv5i DjST9wnbT+GIUksZSc2khVAOcym88ZZQUR1e0VUhWOALn3uJ17e7kNs4KqD4L3DwuvEbhf q5ndSewtN6+ggCMS5m+hcU3REy9veWkcxlxAuOknTOKN3rAeE8J0PRdH728kMVEavv/WbF SrK4WaTgcMV8Pi3jbdYr9pv/DBe6VH38+MT7G5fg40Ux1Au7LLoBoOIqtsDu6g== 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 4WbL436zvqzm7p; Fri, 2 Aug 2024 22:24:51 +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 472MOpWW065132; Fri, 2 Aug 2024 22:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 472MOpXY065129; Fri, 2 Aug 2024 22:24:51 GMT (envelope-from git) Date: Fri, 2 Aug 2024 22:24:51 GMT Message-Id: <202408022224.472MOpXY065129@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: ff553877227e - 2024Q3 - devel/llvm15: 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/2024Q3 X-Git-Reftype: branch X-Git-Commit: ff553877227e10a468f541cd6332a2d1bba9c714 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff553877227e10a468f541cd6332a2d1bba9c714 commit ff553877227e10a468f541cd6332a2d1bba9c714 Author: Dimitry Andric AuthorDate: 2024-08-02 19:44:40 +0000 Commit: Dimitry Andric CommitDate: 2024-08-02 22:23:48 +0000 devel/llvm15: 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/llvm15 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/llvm15/work-default/llvm-project-15.0.7.src/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp:638: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 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 (cherry picked from commit b8c038829f6bf89110528e33889ef43b01f23e79) --- devel/llvm15/Makefile | 1 + devel/llvm15/distinfo | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile index 900606601e2a..b75f500f4fc8 100644 --- a/devel/llvm15/Makefile +++ b/devel/llvm15/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/llvm15/distinfo b/devel/llvm15/distinfo index 7abec8c5f61f..31cb67814ddc 100644 --- a/devel/llvm15/distinfo +++ b/devel/llvm15/distinfo @@ -1,6 +1,8 @@ -TIMESTAMP = 1673554510 +TIMESTAMP = 1722603701 SHA256 (llvm-project-15.0.7.src.tar.xz) = 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6 SIZE (llvm-project-15.0.7.src.tar.xz) = 110936452 +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