From owner-svn-ports-head@freebsd.org Thu Nov 8 12:07:55 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8642D112796C; Thu, 8 Nov 2018 12:07:55 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E65C27AE97; Thu, 8 Nov 2018 12:07:54 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C756224475; Thu, 8 Nov 2018 12:07:54 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8C7sFq088717; Thu, 8 Nov 2018 12:07:54 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8C7s2I088716; Thu, 8 Nov 2018 12:07:54 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201811081207.wA8C7s2I088716@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Thu, 8 Nov 2018 12:07:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484446 - head/devel/cquery X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/devel/cquery X-SVN-Commit-Revision: 484446 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E65C27AE97 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.989,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Nov 2018 12:07:55 -0000 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@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@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: