From nobody Fri Aug 02 22:24:53 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 4WbL452c4Yz5RJm1; Fri, 02 Aug 2024 22:24:53 +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 4WbL451hGkz4b6X; Fri, 2 Aug 2024 22:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722637493; 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=QTV6h8hFEjUTr8ukwE7M1F03FAkbFUF6MfQn1AKgA5w=; b=EZac9FYw3kmPkpvzwMkOTu7/95RQxngc7ShNsUpi3u2EuVtppF+XeBPR6TIAnsBBi//fe7 oS7ML3J1XUFKWpmjrLF+z5FOx7/tcDeOY9okqHVWEiYwKmbVTWQAOV3lWPX2S7gy1upfiu b0cLFOk4iwC7RdOtAyjClDazhstmqC9yzHgwn+sIrcIdotuInWldSau4RXfl/y/Hg0VkJO iKB1D50ZAmbgvlNEZ6O2Q3O0VI1bUsdA9m1QYeQZAQI2x5sbSk+Nh5GnfwRGi2oAKqaxiU UUYGK1eOa39piWe6tS6M+EFvLcICjdxD+w5tD5tPVWQ45CZffUTrT2ZQG/hDLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722637493; a=rsa-sha256; cv=none; b=yQf1x19HP3sg2xU1Leg61MJ+69uasbYAOWvNfA4OnXnXOMfDYa4uq08mPFaZbwdtYcqatw L+nlyidt2F2Th+WHmrUiDMJ+EJrqD+rpFouwpEH7l24gLUGtOrBYF96pX6HXB6K5KLFO7C 79v+DSZdEXrR8hmL9lDNyLlJmQRi2KINu0MRsUna5q+uudsoqtcjf55FKSDd2W7sdTzV8A 68qfnWO2cfYmxE3SFa/pTqXHV9A5ZZAxo4wb75qYhexzgFDVonZcbD5LeOh0flWGmOsrJQ ifLpj06bGNbh6kXTQpfiIp5kdXzvn2ZZfEMYKniqDqEU5vyVChDknD4iZhHBow== 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=1722637493; 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=QTV6h8hFEjUTr8ukwE7M1F03FAkbFUF6MfQn1AKgA5w=; b=RiPAdXPJnQltXtwyLIUuluFWo/S17QCjqvEYRsVl+LFNx/7WJthGvkIFr+q4uDUmu3dsfV Kx7CEEMT+s6dFCIog0F4wwPW0VMXQAjfyZfGQfz0+dq8iRXaJ6r0KWmZ5WdrJWYzNVUAy9 Dq45f1tDyxap8LDKCjlgPQJk7XJlPEbixWV77sRpRvN86H8fPkZxEK0xEtT8kk1C0NVS1s 8UMQ/TM8HieIEnJLfhj5Di5Z1HuM5IbC2KSfswc6Zo7N755NMDGwEDZpG7OCQ+kcEAZ0vZ /XqdUs/sKOalAtfNjxCNQuSfbAFB+pJEo7G5xTHQcx9R3lzcHjIqebOsm7fCmA== 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 4WbL451DNmzmSr; Fri, 2 Aug 2024 22:24:53 +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 472MOr47065177; Fri, 2 Aug 2024 22:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 472MOr6A065174; Fri, 2 Aug 2024 22:24:53 GMT (envelope-from git) Date: Fri, 2 Aug 2024 22:24:53 GMT Message-Id: <202408022224.472MOr6A065174@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: 7c58282e5ae4 - 2024Q3 - devel/llvm14: 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: 7c58282e5ae421d902d575d5f2da79789603d157 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c58282e5ae421d902d575d5f2da79789603d157 commit 7c58282e5ae421d902d575d5f2da79789603d157 Author: Dimitry Andric AuthorDate: 2024-08-02 19:45:52 +0000 Commit: Dimitry Andric CommitDate: 2024-08-02 22:24:01 +0000 devel/llvm14: 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/llvm14 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/llvm14/work-default/llvm-project-14.0.6.src/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp:603: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 413bde7bbb5ceb746a226593d67c1bc95fcdd5ce) --- devel/llvm14/Makefile | 1 + devel/llvm14/distinfo | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index 25c95a6fb6b2..f59acfb1106d 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/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/llvm14/distinfo b/devel/llvm14/distinfo index 987d3431ff51..37e3d0cb3e6a 100644 --- a/devel/llvm14/distinfo +++ b/devel/llvm14/distinfo @@ -1,6 +1,8 @@ -TIMESTAMP = 1656378667 +TIMESTAMP = 1722603694 SHA256 (llvm-project-14.0.6.src.tar.xz) = 8b3cfd7bc695bd6cea0f37f53f0981f34f87496e79e2529874fd03a2f9dd3a8a SIZE (llvm-project-14.0.6.src.tar.xz) = 105618228 +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