From nobody Sat Mar 18 16:12:08 2023 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 4Pf5c83j9Pz3ykfm; Sat, 18 Mar 2023 16:12:08 +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 4Pf5c83Fc3z3G6T; Sat, 18 Mar 2023 16:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679155928; 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=Y3a/8H5wVAxJaAxaRjZirfCMeKc6FcFaWooHqDSNOf8=; b=SK682B7z47xl2nekSbeS3/V4UunyO+JfH0gYRLBS6dQbE+4fJj7Ulw8/D4qG51dtRytKAU /UeM8jWnH2yRdoPWz0ams8i6kwh3ws52KpwWIfb5AyJ3FsFt55V/gBiNIZ4Y3VYbWhg5ab zr7wzK0hJk66X0u6Yn9a0WA42ZSrYbFCiIRuBtd2ZAqwBhGnyXKkFWTjHD16msMJB/Ps9f sU9TD3WZYvgaecibRs7wLZ+L6TklOjhLdLYLxVl/Dje/LpGMjeL6qTJ9di4FDSkTpvod8o WirUU+o3ELzrXUT8hCZF4fSZZQkX37aNtnyHHQaKQI2xmiwvNZYmMndAVMsrpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679155928; 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=Y3a/8H5wVAxJaAxaRjZirfCMeKc6FcFaWooHqDSNOf8=; b=EdTUE8RedIh5mi5836a24hTBYTznVKm9DnnVCsQWTT+I9mU6CQBPqDvfHFKz7vsoYlVWCh +pKbFDbazPEs/rDobBce1mBeWvbml93zADvNkVVGKGLQORZ3EutZsX2V6XX50M9kE+SVEB uRAPvJ2tFKS4frAWSVfeZXhRb4h1kMtUWQSRO6pzT6CINYA+Tfdyf2v45YtuZtnZAmmgkK oPp/YywHhZa1VwtdymPIW3ogPqPRlXtGQcT4ZtiTuaxgr+BqFe50CjA8FxoWX3SS79jVLR 7d6Qlo6f3CPvqqOCgnX9pW/Lvt8SgpzZ8BqY84CiaBNC5cwkF36xsoW01g/eHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679155928; a=rsa-sha256; cv=none; b=bRbBpR8yvdWS3CYXPEmjZ0YaJUHOm8UXeTyKvTusOekUV7VdgyNKzJxTYFHELX/SyJ7W6f TD5SA5d0AMNSM35q3Mn0cc7PcQ1k5Sg6MM74T/Uh5nc20IKBsFXGkOlw7PBus3/Pb2baCm fhsn9N/IM37yNASEEZUSjzhMsWGwc2zaNn+Hab6lbZekta9kh0y28hYVuXVLLn4eEL0qZ5 orIvCZO6S62BOQBOWHrMP1Vvxhaqwq1lL8txp9/rauJNA/oryHM/atmtLpSX63h4+A56g0 7wuH6AuK5a1QbNqYdzuLE/4yv9n8loX0FMx+fX53DF0h0DKUwD+yM47TByukdA== 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 4Pf5c82LPWz1Cxt; Sat, 18 Mar 2023 16:12:08 +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 32IGC8Q6005508; Sat, 18 Mar 2023 16:12:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32IGC8uJ005507; Sat, 18 Mar 2023 16:12:08 GMT (envelope-from git) Date: Sat, 18 Mar 2023 16:12:08 GMT Message-Id: <202303181612.32IGC8uJ005507@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: 8a459e62a97c - main - devel/cvise: switch to USES=llvm 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: 8a459e62a97c1f21ed317964131308836b26ccbf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a459e62a97c1f21ed317964131308836b26ccbf commit 8a459e62a97c1f21ed317964131308836b26ccbf Author: Dimitry Andric AuthorDate: 2023-03-18 16:08:50 +0000 Commit: Dimitry Andric 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 .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: