Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Mar 2023 16:12:08 GMT
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: 8a459e62a97c - main - devel/cvise: switch to USES=llvm
Message-ID:  <202303181612.32IGC8uJ005507@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8a459e62a97c1f21ed317964131308836b26ccbf

commit 8a459e62a97c1f21ed317964131308836b26ccbf
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2023-03-18 16:08:50 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2023-03-18 16:11:52 +0000

    devel/cvise: switch to USES=llvm
    
    Instead of hand-declaring llvm dependencies, use USES=llvm instead.
    This still needs USES=compiler for checking the base system's clang
    version, as cvise 2.7.0 requires clang >= 15 to compile.
    
    PR:             269935
    Reported by:    pkubaj
    Approved by:    maintainer timeout (2 weeks)
    MFH:            2023Q1
---
 devel/cvise/Makefile | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/devel/cvise/Makefile b/devel/cvise/Makefile
index 5159178832b7..9f84c749be86 100644
--- a/devel/cvise/Makefile
+++ b/devel/cvise/Makefile
@@ -13,13 +13,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pebble>0:devel/py-pebble@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
-		llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
+		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 RUN_DEPENDS=	bash:shells/bash \
 		${PYTHON_PKGNAMEPREFIX}pebble>0:devel/py-pebble@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
-		llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
+		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0:devel/py-pytest-flake8@${PY_FLAVOR}
 #		gcc:lang/gcc
@@ -29,10 +27,9 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 # once this is installed, all tests pass for me:
 # 260 passed, 1 skipped in 64.82 seconds
 
-USES=		cmake compiler 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=	15
+USES=		cmake compiler llvm:min=15,build,run python:3.6+ shebangfix
+CMAKE_ARGS+=	-DLLVM_DIR:PATH=${LLVM_PREFIX}/lib/cmake/llvm
+CMAKE_ARGS+=	-DClang_DIR:PATH=${LLVM_PREFIX}/lib/cmake/clang
 SHEBANG_FILES=	cvise-delta.py cvise.py
 USE_GITHUB=	yes
 GH_ACCOUNT=	marxin
@@ -46,9 +43,9 @@ PATCHFILES+=	222313aa5467d22ba58d3fdc3198abdf75a07f0e.patch:-p1
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 150
-CPP=		clang-cpp${LLVM_VER}
-CC=		clang${LLVM_VER}
-CXX=		clang++${LLVM_VER}
+CPP=		clang-cpp${LLVM_VERSION}
+CC=		clang${LLVM_VERSION}
+CXX=		clang++${LLVM_VERSION}
 .endif
 
 post-patch:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303181612.32IGC8uJ005507>