From nobody Fri Aug 02 22:04:14 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 4WbKcG43xLz5RGsd; Fri, 02 Aug 2024 22:04:14 +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 4WbKcG1rhGz4Y0X; Fri, 2 Aug 2024 22:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722636254; 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=6gNS9CHfDxerpjCg6ALKaZCVswF7vXJguRyqrhYHJpY=; b=o3L5tm0fCIymHRu9JWIbjGHKpvQxAbR7uy3rh/M5467GJJB5ssqzZB/78zNLGNISHq92yt Rjll0NN4kDimDenlLfo5VMnOnsAGzSF+XoE1lJWT+My0Dv3PCKAUk8Pn7c1JobA4XCkgFg 8u2PEHFO9ZW/YMm2JBtq602IHBhNU0G8kK4MTN7y3/yi+pkdEo6cervRU5Z+3sOWxX85jt Gfopvxh0JnXWczxloi54fkvkZWu7ZgI3qPu3KlNuPcXPsAF4MehS4Xt6TrFQZ6MLL9EI+l Q/mtwRI1P8YPOcPvSIQpgWyJE2eJjTzqHwce3ZqhIN9ZLy/EW9mQ27UyV6xfrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722636254; a=rsa-sha256; cv=none; b=ti+RzA2Of4EP8UrbMEGq3nx9kO00ABqdKtULrRqpvz8UcYbyZ5eLBjNSrB5HX776LZXKcg 8rLKtOY0VFh16/4ILmgXX0CbWSjvSEob8Bh54wZ0SvOfyJPYDd7d5CoOO7bMjc4s/NTNYI TYgMANI6783LBmxmTDTNpqRAaDtKHn9I/yJNuiZfcBU/ncm+Z521gMqu+g3hFIc2HJosUi 8v6CPIlRZEPSKI0yacF4gtebPxlih2H/93yvJ+S/dLONCHEODg/eiLJJIEu0kM+JuMRtnE 2wdGX2mb1AlQ5mdo3kbQc9TIWkut/yPTbwXc1vTrXkITS2LbA6YgFZxdYpizxA== 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=1722636254; 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=6gNS9CHfDxerpjCg6ALKaZCVswF7vXJguRyqrhYHJpY=; b=BT4qIufNrVtAf6m0hq0hxQfyLGqOzfIffQuSscvvfZ5CEfMYQ/FG8jHgwW4jicbXqlGFFX QAVIcd7fjCjI91JTcEPL5KvUGMcf+bWZUBgSBB6DUkMKHekcVkicFiQOrOpFzo1sQiK0CV ggyeug5kl5XiSsEmFacV87H207IUv5A7OrP9vZegABKSHs671398LEx3MGRDdmg8DFUouC leKuV9TWN/C2DoNGPhZWMqN0H2duc56RKfV7DcjTtFIawt17KRF09h9dlT5rEk1tv2u6FQ +izJnluQUv82SSmae9n6HGS2TgwWk1ujaOXPoJSObWs/DgJOsWnBXCYRuYC6Nw== 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 4WbKcG1TRHzly1; Fri, 2 Aug 2024 22:04:14 +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 472M4Eu4030824; Fri, 2 Aug 2024 22:04:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 472M4Ecq030821; Fri, 2 Aug 2024 22:04:14 GMT (envelope-from git) Date: Fri, 2 Aug 2024 22:04:14 GMT Message-Id: <202408022204.472M4Ecq030821@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: b8c038829f6b - main - devel/llvm15: 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: b8c038829f6bf89110528e33889ef43b01f23e79 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8c038829f6bf89110528e33889ef43b01f23e79 commit b8c038829f6bf89110528e33889ef43b01f23e79 Author: Dimitry Andric AuthorDate: 2024-08-02 19:44:40 +0000 Commit: Dimitry Andric CommitDate: 2024-08-02 22:00:50 +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 --- 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