aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradridg <adridg@FreeBSD.org>2019-08-12 01:37:57 +0800
committeradridg <adridg@FreeBSD.org>2019-08-12 01:37:57 +0800
commit2325e60cf87375baf5d7d115e0ed4996aa09cd4d (patch)
tree6ef435653257ed59e3ad8bf50cc84208e7e8fed6
parentea419d19d7012690ef37e169477b7a9d3ec7a795 (diff)
downloadfreebsd-ports-gnome-2325e60cf87375baf5d7d115e0ed4996aa09cd4d.tar.gz
freebsd-ports-gnome-2325e60cf87375baf5d7d115e0ed4996aa09cd4d.tar.zst
freebsd-ports-gnome-2325e60cf87375baf5d7d115e0ed4996aa09cd4d.zip
Make devel/qt5-qdoc use LLVM_DEFAULT instead of hard-coded version
Having the version hard-coded makes it hard to chase LLVM updates; having a different LLVM version from the rest of the stack -- in particular from what mesa uses -- means building an extra LLVM just for parsing documentation from Qt modules. linimon@ suggests using an easily-spotted variable in PR 239740 but we can go one better and just use the LLVM that's there. PR: 239740 Submitted by: linimon
-rw-r--r--devel/qt5-qdoc/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile
index 32702cfd8806..eea703359093 100644
--- a/devel/qt5-qdoc/Makefile
+++ b/devel/qt5-qdoc/Makefile
@@ -9,8 +9,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation generator
-BUILD_DEPENDS= llvm60>=0:devel/llvm60
-RUN_DEPENDS= llvm60>=0:devel/llvm60
+BUILD_DEPENDS= llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT}
+RUN_DEPENDS= llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT}
USES= compiler:c++11-lang qmake qt-dist:5,tools
USE_QT= core declarative buildtools_build qdoc-data_run
@@ -20,6 +20,6 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
PLIST_FILES= ${QT_BINDIR}/qdoc
-CONFIGURE_ENV= LLVM_INSTALL_DIR=${LOCALBASE}/llvm60
+CONFIGURE_ENV= LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}
.include <bsd.port.mk>