svn commit: r508658 - head/devel/qt5-qdoc

Adriaan de Groot adridg at FreeBSD.org
Sun Aug 11 17:37:58 UTC 2019


Author: adridg
Date: Sun Aug 11 17:37:57 2019
New Revision: 508658
URL: https://svnweb.freebsd.org/changeset/ports/508658

Log:
  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

Modified:
  head/devel/qt5-qdoc/Makefile

Modified: head/devel/qt5-qdoc/Makefile
==============================================================================
--- head/devel/qt5-qdoc/Makefile	Sun Aug 11 17:29:10 2019	(r508657)
+++ head/devel/qt5-qdoc/Makefile	Sun Aug 11 17:37:57 2019	(r508658)
@@ -9,8 +9,8 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde at 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>


More information about the svn-ports-head mailing list