From nobody Sun Dec 25 17:54:39 2022 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 4Ng7pm11Lwz1G7P0; Sun, 25 Dec 2022 17:54:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ng7pm0ZyCz4ktM; Sun, 25 Dec 2022 17:54:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671990880; 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=3bn1yWt+cOmAXs1pl9o/xXpEJ78Ytu2YdrhqLJVI9qk=; b=auNektx8OxjWTYSXLuyrmYA8kHKLLqo+Modu+T6Yl6XJzbscNGk33bLs8juYnQsKPCk4hG pUsM1iXswpR6BX+5zy2Tgji6KIcKTewdwN+oU8DDqrHs9t0zRBKu/SFk1J08x2ofLfGQDN tuPC+/rzHKVyN4MqWMo51jMyFwfPfgd/gyUoyy1NUvPFHwu0Dn+FqOd2kIY/5h8ErGeprm rukGVxgvlfElux6nZO0+bS917+2/dRLj6sucYK2JRtgjgUF6x/FdAqfFuk6Q1R3FfOUup6 gRVoY0DxoKx3sQVVoN3QNWKAhqXHM5OvtkR+e+XM2JQFiRVJLsJF4KFQpsRgSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671990880; 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=3bn1yWt+cOmAXs1pl9o/xXpEJ78Ytu2YdrhqLJVI9qk=; b=wA5d51ZwHi+jznDnfB+4ctEcfpJ6szUM3VDM+cZLhzqmHk/TwbQJbwI1qa7gxw9VJgap0X r5puEOeaXBxPBrsT2xOE+fotfd6I4AK1UiE6wNfAJsX2JRMExfleOZWsW1kOiU8xrXyRS0 QEANQKkB7iSQr/4YddCMi4nuUlbein2fJwUMUvk45pCs3B73sOUuuhs8EVA2Da5dsFcYcC O1BaYme4OSR+PBcx7Fd99cvZnrEI9bMWwIXHVLpG0LYLZG9AY6gt9IQy02AzJW4G/kRfIe GyOLCCWln+52lJT+brbxMpOUDYlh+I9+HJ3u8GDnkLxCBzC7GlUHKm4IqgEupg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671990880; a=rsa-sha256; cv=none; b=Ma2ipCQwgD4Pz1SkokPZI71crlimDIp1HJt7QHqMIHn789k/Cdgiv1kkzNrZqNUIvIEnBw IXW8mB6I5GN6TCPCsduQBhik9hYLmyp8XCj45n9Wagiq+9FaT8HFbb7ybGLnlz/4K71uzX LT51Bo4M88riggeKZclINodVFRDe7DMjWRgSW2mBEUuWvD0P9JX01W9yMr7l14Zubiw8Sz dVOaTBDfWQjcABsed9EnTu9AroZy5qVtq16d+Gg7Se4dvvbqc36S16rUh0mwMVrwvVQ3gp EnVidcUe1qBweMbWmGpkirwNFrgzR8kEiiWOr69nzp4c4/Xb5NTZa9CAtkzJmw== 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 4Ng7pl6R8yz11Pl; Sun, 25 Dec 2022 17:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BPHsdPg042798; Sun, 25 Dec 2022 17:54:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BPHsdDn042797; Sun, 25 Dec 2022 17:54:39 GMT (envelope-from git) Date: Sun, 25 Dec 2022 17:54:39 GMT Message-Id: <202212251754.2BPHsdDn042797@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: 0f1ce09fbc7d - main - devel/cvise: fix build with devel/llvm15 installed 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 0f1ce09fbc7d660aacacf0428f26632896b89419 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=0f1ce09fbc7d660aacacf0428f26632896b89419 commit 0f1ce09fbc7d660aacacf0428f26632896b89419 Author: Dimitry Andric AuthorDate: 2022-12-08 16:18:19 +0000 Commit: Dimitry Andric 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' 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