diff options
| author | brooks <brooks@FreeBSD.org> | 2017-10-15 02:54:51 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2018-02-04 05:44:41 +0800 |
| commit | 08274c5d31dba21f87da04b8bf05ecee88d80d2f (patch) | |
| tree | 3491830bd6a54a6bc43ede2413671497cf40388f /devel | |
| parent | 7e3bea2d5d5d6ec0deea192406d38db9cf1fec58 (diff) | |
| download | freebsd-ports-gnome-08274c5d31dba21f87da04b8bf05ecee88d80d2f.tar.gz freebsd-ports-gnome-08274c5d31dba21f87da04b8bf05ecee88d80d2f.tar.zst freebsd-ports-gnome-08274c5d31dba21f87da04b8bf05ecee88d80d2f.zip | |
Fix build without EXTRAS (clangd is part of EXTRAS, not CLANG). [0]
Update ccache links on install/deinstall. [1]
PR: 222964 [0], 217572 [1]
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/llvm50/Makefile | 7 | ||||
| -rw-r--r-- | devel/llvm50/pkg-plist | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/devel/llvm50/Makefile b/devel/llvm50/Makefile index 84c63163f3ff..49604dde63c3 100644 --- a/devel/llvm50/Makefile +++ b/devel/llvm50/Makefile @@ -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/aarch64/}-portbld-${OPSYS:tl}${ .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: diff --git a/devel/llvm50/pkg-plist b/devel/llvm50/pkg-plist index 6525a0651f1f..29399927ad5a 100644 --- a/devel/llvm50/pkg-plist +++ b/devel/llvm50/pkg-plist @@ -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 |