git: 346002f7e2f5 - main - security/solana: Use llvm15

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Thu, 17 Oct 2024 02:56:46 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=346002f7e2f599c289be50d899f13cfb9dada0fb

commit 346002f7e2f599c289be50d899f13cfb9dada0fb
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-10-17 02:55:40 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-10-17 02:56:41 +0000

    security/solana: Use llvm15
---
 security/solana/Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/security/solana/Makefile b/security/solana/Makefile
index cf5780bad581..9c293e4b1979 100644
--- a/security/solana/Makefile
+++ b/security/solana/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	solana
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.17.9
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	security
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -15,12 +15,11 @@ BROKEN_armv7=		compilation failure: error[E0512]: cannot transmute between types
 BROKEN_i386=		fails on 32-bit systems: https://github.com/solana-labs/solana/issues/16811
 BROKEN_powerpc64le=	compilation failure: called `Option::unwrap()` on a `None` value in ring-0.16.20/build.rs:358:10 # see https://github.com/rust-lang/rust/issues/119901
 
-BUILD_DEPENDS=	llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} \
-		protoc:devel/protobuf \
+BUILD_DEPENDS=	protoc:devel/protobuf \
 		gmake:devel/gmake
 LIB_DEPENDS=	libhidapi.so:comms/hidapi
 
-USES=		cargo pkgconfig ssl
+USES=		cargo llvm:lib pkgconfig ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	solana-labs
@@ -693,9 +692,7 @@ XARCH=		${ARCH:S/amd64/x86_64/:tu}
 MAKE_ENV=	${XARCH}_UNKNOWN_FREEBSD_OPENSSL_INCLUDE_DIR=${OPENSSLINC} \
 		${XARCH}_UNKNOWN_FREEBSD_OPENSSL_LIB_DIR=${OPENSSLLIB}
 
-LLVM_VERSION=	12
-
-BINARY_ALIAS=	llvm-config=${PREFIX}/bin/llvm-config${LLVM_VERSION}
+BINARY_ALIAS=	llvm-config=${LOCALBASE}/bin/${LLVM_CONFIG}
 
 do-install:
 	for f in ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${PORTNAME}*; do \