From owner-svn-ports-head@freebsd.org Mon Apr 8 00:37:47 2019 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 2A99A156FB92; Mon, 8 Apr 2019 00:37:47 +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 BAADB80609; Mon, 8 Apr 2019 00:37:46 +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 A05151BD8B; Mon, 8 Apr 2019 00:37:46 +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 x380bkP5091796; Mon, 8 Apr 2019 00:37:46 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x380bka6091795; Mon, 8 Apr 2019 00:37:46 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201904080037.x380bka6091795@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:37:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498336 - head/devel/ccls X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/devel/ccls X-SVN-Commit-Revision: 498336 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BAADB80609 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_SHORT(-0.95)[-0.950,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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: Mon, 08 Apr 2019 00:37:47 -0000 Author: tobik Date: Mon Apr 8 00:37:46 2019 New Revision: 498336 URL: https://svnweb.freebsd.org/changeset/ports/498336 Log: 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 Modified: head/devel/ccls/Makefile Modified: head/devel/ccls/Makefile ============================================================================== --- head/devel/ccls/Makefile Mon Apr 8 00:34:41 2019 (r498335) +++ head/devel/ccls/Makefile Mon Apr 8 00:37:46 2019 (r498336) @@ -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