svn commit: r484446 - head/devel/cquery

[Tobias Kortkamp]

Author: tobik
Date: Thu Nov  8 12:07:54 2018
New Revision: 484446
URL: https://svnweb.freebsd.org/changeset/ports/484446

Log:
  devel/cquery: Allow overriding the LLVM version via LLVM_DEFAULT
  
  - Cquery builds and works fine with LLVM 7 for example
  - Make the libclang.so spec more specific to prevent the framework
    from picking the wrong library version from llvm60 with LLVM_DEFAULT=70
    when both llvm60 and llvm70 are installed in the build environment
  
  PR:		232598
  Approved by:	henry.hu.sh at gmail.com (maintainer timeout, 2 weeks)

Modified:
  head/devel/cquery/Makefile

Modified: head/devel/cquery/Makefile
==============================================================================
--- head/devel/cquery/Makefile	Thu Nov  8 12:00:58 2018	(r484445)
+++ head/devel/cquery/Makefile	Thu Nov  8 12:07:54 2018	(r484446)
@@ -3,6 +3,7 @@
 PORTNAME=	cquery
 PORTVERSION=	20180718
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	henry.hu.sh at gmail.com
@@ -12,8 +13,8 @@ LICENSE=	MIT
 
 BROKEN_powerpc64=	fails to build: Checking for 'clang++' (C++ compiler): not found
 
-BUILD_DEPENDS=	llvm-config60:devel/llvm60
-LIB_DEPENDS=	libclang.so:devel/llvm60
+BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
+LIB_DEPENDS=	libclang.so.${LLVM_DEFAULT:C/[0-9]$//}:devel/llvm${LLVM_DEFAULT}
 
 USES=		compiler:c++14-lang waf
 
@@ -26,9 +27,11 @@ GH_TUPLE=	miloyip:rapidjson:daabb88:rapidjson/third_pa
 		emilk:loguru:6bf94c:loguru/third_party/loguru \
 		zeux:pugixml:24a7064:pugixml/third_party/pugixml
 
+LLVM_DEFAULT?=	60
+
 PLIST_FILES=	bin/cquery
 
-CONFIGURE_ARGS=	--variant=system --llvm-config=${LOCALBASE}/bin/llvm-config60
+CONFIGURE_ARGS=	--variant=system --llvm-config=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}
 MAKE_ARGS=	--variant=system
 
 post-install: