Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 18 Dec 2022 00:15:47 GMT
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e9d1439a0c0d - main - devel/qt6-tools: convert to USES=llvm
Message-ID:  <202212180015.2BI0FlZa002805@gitrepo.freebsd.org>

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

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

commit e9d1439a0c0d4ca1df48061fc560241bacd99418
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2022-12-18 00:07:28 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-12-18 00:15:00 +0000

    devel/qt6-tools: convert to USES=llvm
---
 devel/qt6-tools/Makefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/devel/qt6-tools/Makefile b/devel/qt6-tools/Makefile
index 79bb697c9713..c3d725c646b9 100644
--- a/devel/qt6-tools/Makefile
+++ b/devel/qt6-tools/Makefile
@@ -7,10 +7,8 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt declarative framework for dynamic user interfaces
 WWW=		https://qt-project.org
 
-BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
-		llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
+BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader \
-		libLLVM.so:devel/llvm${LLVM_DEFAULT} \
 		libdouble-conversion.so:devel/double-conversion \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
@@ -24,7 +22,7 @@ LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader \
 		libxkbcommon.so:x11/libxkbcommon \
 		libzstd.so:archivers/zstd
 
-USES=		cmake compiler:c++17-lang gettext-runtime gl gnome python:build xorg \
+USES=		cmake compiler:c++17-lang gettext-runtime gl gnome llvm:lib python:build xorg \
 		qt-dist:6
 USE_GL=		gl
 USE_GNOME=	glib20
@@ -32,8 +30,8 @@ USE_QT=		base declarative
 USE_XORG=	x11 xau xcb xdmcp
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
-CMAKE_ARGS+=	-DClang_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/clang" \
-		-DLLVM_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm"
+CMAKE_ARGS+=	-DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \
+		-DLLVM_DIR:PATH="${LLVM_PREFIX}/lib/cmake/llvm"
 
 post-install:
 	# Install symlinks for user-facing tools



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