From owner-svn-ports-branches@freebsd.org Mon Apr 8 00:38:30 2019 Return-Path: Delivered-To: svn-ports-branches@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 BDB73156FBCF; Mon, 8 Apr 2019 00:38:30 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 59EE7806E4; Mon, 8 Apr 2019 00:38:30 +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 2E0BB1BD8D; Mon, 8 Apr 2019 00:38:30 +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 x380cU42091961; Mon, 8 Apr 2019 00:38:30 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x380cUnP091960; Mon, 8 Apr 2019 00:38:30 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201904080038.x380cUnP091960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 8 Apr 2019 00:38:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r498337 - branches/2019Q2/devel/ccls X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: branches/2019Q2/devel/ccls X-SVN-Commit-Revision: 498337 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 59EE7806E4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.950,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 00:38:30 -0000 Author: tobik Date: Mon Apr 8 00:38:29 2019 New Revision: 498337 URL: https://svnweb.freebsd.org/changeset/ports/498337 Log: MFH: r498336 devel/ccls: Fix build with multiple llvm* packages installed Apparently it is possible for the build to pick multiple LLVM versions if LLVM_DIR is not explicitly set similar to Clang_DIR. $ grep llvm $(make -V CONFIGURE_WRKSRC)/CMakeCache.txt Clang_DIR:PATH=/usr/local/llvm80/lib/cmake/clang LLVM_DIR:PATH=/usr/local/llvm50/lib/cmake/llvm PR: 237089 Submitted by: fullermd@over-yonder.net Approved by: ports-secteam blanket Modified: branches/2019Q2/devel/ccls/Makefile Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/devel/ccls/Makefile ============================================================================== --- branches/2019Q2/devel/ccls/Makefile Mon Apr 8 00:37:46 2019 (r498336) +++ branches/2019Q2/devel/ccls/Makefile Mon Apr 8 00:38:29 2019 (r498337) @@ -21,7 +21,8 @@ GH_ACCOUNT= MaskRay # Commit matching 0.20190314 #GH_TAGNAME= 1976fec59559b7d2a88b5dcd7631e089eaa194fc -CMAKE_ARGS= -DClang_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/clang" +CMAKE_ARGS= -DClang_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/clang" \ + -DLLVM_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm" CXXFLAGS+= -DNDEBUG PLIST_FILES= bin/ccls