Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 14 Oct 2017 18:54:51 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r452079 - head/devel/llvm50
Message-ID:  <201710141854.v9EIspTL056202@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: brooks
Date: Sat Oct 14 18:54:51 2017
New Revision: 452079
URL: https://svnweb.freebsd.org/changeset/ports/452079

Log:
  Fix build without EXTRAS (clangd is part of EXTRAS, not CLANG). [0]
  
  Update ccache links on install/deinstall. [1]
  
  PR:		222964 [0], 217572 [1]

Modified:
  head/devel/llvm50/Makefile
  head/devel/llvm50/pkg-plist

Modified: head/devel/llvm50/Makefile
==============================================================================
--- head/devel/llvm50/Makefile	Sat Oct 14 18:51:41 2017	(r452078)
+++ head/devel/llvm50/Makefile	Sat Oct 14 18:54:51 2017	(r452079)
@@ -2,7 +2,7 @@
 
 PORTNAME=	llvm
 DISTVERSION=	5.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
@@ -172,10 +172,12 @@ EXTRAS_COMMANDS+= \
 		clang-rename \
 		clang-reorder-fields \
 		clang-tidy \
+		clangd \
 		find-all-symbols \
 		modularize
 EXTRAS_LIBS=	libclangApplyReplacements \
 		libclangChangeNamespace \
+		libclangDaemon \
 		libclangIncludeFixer \
 		libclangMove \
 		libclangQuery \
@@ -212,7 +214,6 @@ CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch
 .if ${PORT_OPTIONS:MCLANG}
 COMMANDS+=	c-index-test \
 		clang \
-		clangd \
 		clang++ \
 		clang-check \
 		clang-cpp \
@@ -506,6 +507,8 @@ build-plist:
 	    if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} \
 	    if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
 	    if ($$0 !~ /libclang_rt/) {print}}' ${PLIST}.tmp >> ${PLIST}
+	${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
+	${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${RM} ${PLIST}.tmp
 
 check-commands:

Modified: head/devel/llvm50/pkg-plist
==============================================================================
--- head/devel/llvm50/pkg-plist	Sat Oct 14 18:51:41 2017	(r452078)
+++ head/devel/llvm50/pkg-plist	Sat Oct 14 18:54:51 2017	(r452079)
@@ -41,7 +41,6 @@ bin/opt%%LLVM_SUFFIX%%
 bin/sancov%%LLVM_SUFFIX%%
 %%CLANG%%bin/c-index-test%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang%%LLVM_SUFFIX%%
-%%CLANG%%bin/clangd%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang++%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang-check%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang-cpp%%LLVM_SUFFIX%%
@@ -62,6 +61,7 @@ bin/sancov%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/clang-rename%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/clang-reorder-fields%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/clang-tidy%%LLVM_SUFFIX%%
+%%EXTRAS%%bin/clangd%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/find-all-symbols%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/modularize%%LLVM_SUFFIX%%
 %%LLD%%bin/lld%%LLVM_SUFFIX%%
@@ -109,7 +109,7 @@ llvm%%LLVM_LIB_VER%%/bin/bugpoint
 %%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-reorder-fields
 %%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-tblgen
 %%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-tidy
-%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clangd
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clangd
 %%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/find-all-symbols
 %%CLANG%%llvm%%LLVM_LIB_VER%%/bin/git-clang-format
 %%LLD%%llvm%%LLVM_LIB_VER%%/bin/ld.lld
@@ -2568,7 +2568,7 @@ llvm%%LLVM_LIB_VER%%/lib/libLTO.so.5
 %%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangBasic.a
 %%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangChangeNamespace.a
 %%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangCodeGen.a
-%%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangDaemon.a
+%%EXTRAS%%llvm%%LLVM_LIB_VER%%/lib/libclangDaemon.a
 %%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangDriver.a
 %%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangDynamicASTMatchers.a
 %%CLANG%%llvm%%LLVM_LIB_VER%%/lib/libclangEdit.a
@@ -2757,3 +2757,5 @@ llvm%%LLVM_LIB_VER%%/share/opt-viewer/style.css
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/main.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/run.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/util.py
+@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
+@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710141854.v9EIspTL056202>