git: 0f1ce09fbc7d - main - devel/cvise: fix build with devel/llvm15 installed
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 25 Dec 2022 17:54:39 UTC
The branch main has been updated by dim (src committer):
URL: https://cgit.FreeBSD.org/ports/commit/?id=0f1ce09fbc7d660aacacf0428f26632896b89419
commit 0f1ce09fbc7d660aacacf0428f26632896b89419
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2022-12-08 16:18:19 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2022-12-25 17:50:27 +0000
devel/cvise: fix build with devel/llvm15 installed
During an exp-run for llvm 15 (see bug 265425), it turned out that
devel/cvise failed to build if devel/llvm15 is also installed:
/wrkdirs/usr/ports/devel/cvise/work/cvise-2.4.0/clang_delta/ExpressionDetector.cpp:62:16: error: 'InclusionDirective' marked 'override' but does not override any member functions
virtual void InclusionDirective(SourceLocation HashLoc,
^
/wrkdirs/usr/ports/devel/cvise/work/cvise-2.4.0/clang_delta/ExpressionDetector.cpp:62:16: warning: '(anonymous namespace)::IncludesPPCallbacks::InclusionDirective' hides overloaded virtual function [-Woverloaded-virtual]
/usr/local/llvm15/include/clang/Lex/PPCallbacks.h:127:16: note: hidden overloaded virtual function 'clang::PPCallbacks::InclusionDirective' declared here: type mismatch at 6th parameter ('Optional<clang::FileEntryRef>' vs 'const clang::FileEntry *')
virtual void InclusionDirective(SourceLocation HashLoc,
^
1 warning and 1 error generated.
This is because during the configure phase, it picks up
ClangConfig.cmake from the llvm13 package, but LLVMConfig.cmake from the
llvm15 package:
-- Found LLVM 15.0.6
-- Using LLVMConfig.cmake in /usr/local/llvm15/lib/cmake/llvm
-- Using ClangConfig.cmake in /usr/local/llvm13/lib/cmake/clang
-- Found PythonInterp: /usr/local/bin/python3 (found suitable version "3.9.15", minimum required is "3.6")
Add a -DLLVM_DIR flag to CMAKE_ARGS to point to the correct directory
for LLVMConfig.cmake.
PR: 268247
Approved by: maintainer timeout (2 weeks)
MFH: 2022Q4
---
devel/cvise/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/devel/cvise/Makefile b/devel/cvise/Makefile
index db4966e611c5..ad0cbc1a1283 100644
--- a/devel/cvise/Makefile
+++ b/devel/cvise/Makefile
@@ -30,6 +30,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
# 260 passed, 1 skipped in 64.82 seconds
USES= cmake python:3.6+ shebangfix
+CMAKE_ARGS+= -DLLVM_DIR:PATH=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/llvm
CMAKE_ARGS+= -DClang_DIR:PATH=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/clang
LLVM_VER= 13
SHEBANG_FILES= cvise-delta.py cvise.py