Date: Wed, 14 Jan 2026 17:37:15 +0000 From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 525f740a3b35 - main - devel/llvm12: fix build with clang 21 Message-ID: <6967d44b.3467f.4d33d086@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=525f740a3b35276c8da8f703d5e15fb7d09a8d1d commit 525f740a3b35276c8da8f703d5e15fb7d09a8d1d Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2026-01-01 13:48:41 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2026-01-14 17:36:43 +0000 devel/llvm12: fix build with clang 21 Recent versions of clang complain about explicit copy constructors, leading to errors similar to: In file included from /wrkdirs/usr/ports/devel/llvm12/work/llvm-project-12.0.1.src/llvm/tools/sancov/sancov.cpp:16: In file included from /wrkdirs/usr/ports/devel/llvm12/work/llvm-project-12.0.1.src/llvm/include/llvm/MC/MCContext.h:12: /wrkdirs/usr/ports/devel/llvm12/work/llvm-project-12.0.1.src/llvm/include/llvm/ADT/DenseMap.h:128:16: warning: variable 'NumEntries' set but not used [-Wunused-but-set-variable] 128 | unsigned NumEntries = getNumEntries(); | ^ /wrkdirs/usr/ports/devel/llvm12/work/llvm-project-12.0.1.src/llvm/tools/sancov/sancov.cpp:512:42: error: chosen constructor is explicit in copy-initialization 512 | return SpecialCaseList::createOrDie({{ClBlacklist}}, | ^~~~~~~~~~~~~ /usr/include/c++/v1/string:1153:64: note: explicit constructor declared here 1153 | _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit basic_string(const _Tp& __t) { | ^ /usr/include/c++/v1/__vector/vector.h:276:91: note: passing argument to parameter '__il' here 276 | _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI vector(initializer_list<value_type> __il) { | ^ In this case, `ClBlacklist` is an instance of `cl::opt`, not a `std::string` as expected. Use `getValue()` to get the actual `std::string` value. PR: 292108 Approved by: brooks (maintainer) MFH: 2026Q1 --- devel/llvm12/files/patch-llvm_tools_sancov_sancov.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/devel/llvm12/files/patch-llvm_tools_sancov_sancov.cpp b/devel/llvm12/files/patch-llvm_tools_sancov_sancov.cpp new file mode 100644 index 000000000000..12e1cae28c3b --- /dev/null +++ b/devel/llvm12/files/patch-llvm_tools_sancov_sancov.cpp @@ -0,0 +1,11 @@ +--- llvm/tools/sancov/sancov.cpp.orig 2021-06-28 16:23:38 UTC ++++ llvm/tools/sancov/sancov.cpp +@@ -509,7 +509,7 @@ class Blacklists { (private) + if (ClBlacklist.empty()) + return std::unique_ptr<SpecialCaseList>(); + +- return SpecialCaseList::createOrDie({{ClBlacklist}}, ++ return SpecialCaseList::createOrDie({{ClBlacklist.getValue()}}, + *vfs::getRealFileSystem()); + } + std::unique_ptr<SpecialCaseList> DefaultBlacklist;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6967d44b.3467f.4d33d086>