From nobody Fri Aug 02 22:24:49 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 4WbL416twmz5RJcf; Fri, 02 Aug 2024 22:24:49 +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 4WbL416NWpz4bHD; Fri, 2 Aug 2024 22:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722637489; 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=JJsVrLhsRJRQVrjSWIUB0TFTRTo19emQrpMccMUv3kI=; b=IL6NMhU6uZFZ+qyL4HLGWUu9TeDmntFpBXT4YnsTyslHo7cMvDJOmOwIFZm+KrL9JUAEde Q6JgJ5HPpR+38MAmW4HxPnkqHal8XKq+O2wwYswGpqxMXq8nV5himE98jhivShJ7yRRjIp DYM3L1oldaigBSr2E9GWzqT2ZZ5u7i/O9xaix+luujFzH8Tf4Vxcv3yKjzbusPOQ3DR9Ed 3Y0s9M74G151L8ITbJvv0kA9nkXc4dJyu7TooPvMNY4G4iApFarBvgUKjOhdqoIEqwau/+ MsSvFKSfQDaDwLSJZUj3/WhmMAOC+DcVdg9kySs8z4ch4gO/FrhjhVEKvMwGMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722637489; a=rsa-sha256; cv=none; b=lD9/mOd31eHbv0q32LUsjl0H6Pux4m/3/bRIz51PN8Uy7G8t6GYuUWPwO1NBQuthYqVZsg Mqm/KMr/ZJf8IhP/2AQN6QneopRXgu8g5sg+MM/ayLL8htCRGusvUYzGHn6Bv6v3HWhy76 O98g7TJzq32sOmb2Pixz/RctTKHK1qO1MQ+r83JH/kxMPbsVKBs32yo1v5pMWar1pTlFXr xJ7qxahwBaVA7VEBtIWBNb2SlQ+5xA6qZqmlVqZum08p9s+3K5QE8KDhb/h6P8APxfNv5F b8wluIvt1/LQKyMRtcawVGlUTYlk4NLr/NYTvq2zX9pnTicDrHB604gEXFoI4w== 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=1722637489; 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=JJsVrLhsRJRQVrjSWIUB0TFTRTo19emQrpMccMUv3kI=; b=jmOWGelaQXDUZ9tMAkzUB/geGwN9BX2AJKalUPEV/yAejYeHdujn5rE1mhQiAp0rNG/1L2 zGC9QQdOyvrwTd2XUyjPA0Z/6rs2lR1bUfk2Zl3JmOiuCpNK1alZeIXlK8AnBiqccf1I93 PPGHPXkQc6vsXuw1TjLjFdoAMqa8/SSQLnZt7XGGD6CCYVmcUJHVHd8SxOH5Ir60o45O2w s6GcXv7bYjewyzLhtX9ex0JS0t3BM7lLjU2BxWZNxyGAynebSkFVJQGvlPnFm1Jmx+j3Xa soZycfMpZVrBmsqMBcsm5zBGp82Fyx9Wphj/EN7xH1qLPiFLSAheW2gjPxtFCQ== 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 4WbL415t6bzm7n; Fri, 2 Aug 2024 22:24:49 +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 472MOn8D065042; Fri, 2 Aug 2024 22:24:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 472MOnV5065039; Fri, 2 Aug 2024 22:24:49 GMT (envelope-from git) Date: Fri, 2 Aug 2024 22:24:49 GMT Message-Id: <202408022224.472MOnV5065039@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: 413e4f9161ad - 2024Q3 - devel/llvm17: 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: 413e4f9161ad0816b15f01e4c6b4f22cd1522281 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=413e4f9161ad0816b15f01e4c6b4f22cd1522281 commit 413e4f9161ad0816b15f01e4c6b4f22cd1522281 Author: Dimitry Andric AuthorDate: 2024-08-02 12:42:16 +0000 Commit: Dimitry Andric CommitDate: 2024-08-02 22:23:31 +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 (cherry picked from commit 7624cbd8af7758af64631f04930089e13fb9fcf7) --- 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