mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

Fix libclangDoc.a installation, install clang-doc80

Browse Source 
Bug 230791 mistakenly put libclangDoc.a under %%DOCS%%.  It actually
belongs to clang extras.

Plus, on 8.0.0, the clang-doc binary does work, so we can install that
too.

PORTREVISION bumped for llvm80 due to new file, not bumped for llvm70 as
this plist change only fixes previously broken OPTIONS configurations.

PR:		230791
Submitted by:	Greg V
Differential Revision:	https://reviews.freebsd.org/D19068
This commit is contained in:
Brooks Davis 2019-02-25 19:28:55 +00:00
parent 083edd6ef9
commit a3db9ba733
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=493890
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/llvm70/Makefile
View File

@ -180,6 +180,7 @@ EXTRAS_COMMANDS+= \
EXTRAS_LIBS= libclangApplyReplacements \
libclangChangeNamespace \
libclangDaemon \
libclangDoc \
libclangIncludeFixer \
libclangMove \
libclangQuery \
@ -529,7 +530,6 @@ build-plist:
if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
{printf "%%%%COMPILER_RT%%%%"} \
if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
if ($$0 ~ /(libclangDoc.a)/) {printf "%%%%DOCS%%%%"} \
if ($$0 ~ /(lld|wasm-ld)/ && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \
if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
if ($$0 ~ /(lib.*omp|omp.h|ompt.h)/) {printf "%%%%OPENMP%%%%"} \

2
devel/llvm70/pkg-plist
View File

@ -2798,7 +2798,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a
%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangDaemon.a
%%CLANG%%%%DOCS%%llvm%%LLVM_SUFFIX%%/lib/libclangDoc.a
%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangDoc.a
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDriver.a
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDynamicASTMatchers.a
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangEdit.a

5
devel/llvm80/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= llvm
DISTVERSION= 8.0.0rc2
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= devel lang
MASTER_SITES= http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
PKGNAMESUFFIX= ${LLVM_SUFFIX}
@ -190,6 +190,7 @@ STRIP_LIBS= BugpointPasses.so \
EXTRAS_COMMANDS+= \
clang-apply-replacements \
clang-change-namespace \
clang-doc \
clang-include-fixer \
clang-modernize \
clang-query \
@ -202,6 +203,7 @@ EXTRAS_COMMANDS+= \
EXTRAS_LIBS= libclangApplyReplacements \
libclangChangeNamespace \
libclangDaemon \
libclangDoc \
libclangIncludeFixer \
libclangMove \
libclangQuery \
@ -611,7 +613,6 @@ build-plist:
if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
{printf "%%%%COMPILER_RT%%%%"} \
if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
if ($$0 ~ /(libclangDoc.a)/) {printf "%%%%DOCS%%%%"} \
if ($$0 ~ /(lld|wasm-ld)/ && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \
if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
if ($$0 ~ /(lib.*omp|omp.h|ompt.h)/) {printf "%%%%OPENMP%%%%"} \

7
devel/llvm80/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt Normal file
View File

@ -0,0 +1,7 @@
--- tools/clang/tools/extra/clang-doc/tool/CMakeLists.txt.orig 2019-02-02 19:08:19 UTC
+++ tools/clang/tools/extra/clang-doc/tool/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(clang-doc
clangToolingCore
)
+install(TARGETS clang-doc RUNTIME DESTINATION bin)

4
devel/llvm80/pkg-plist
View File

@ -70,6 +70,7 @@ bin/hmaptool%%LLVM_SUFFIX%%
%%LLDB%%bin/lldb-vscode%%LLVM_SUFFIX%%
%%EXTRAS%%bin/clang-apply-replacements%%LLVM_SUFFIX%%
%%EXTRAS%%bin/clang-change-namespace%%LLVM_SUFFIX%%
%%EXTRAS%%bin/clang-doc%%LLVM_SUFFIX%%
%%EXTRAS%%bin/clang-include-fixer%%LLVM_SUFFIX%%
%%EXTRAS%%bin/clang-modernize%%LLVM_SUFFIX%%
%%EXTRAS%%bin/clang-query%%LLVM_SUFFIX%%
@ -117,6 +118,7 @@ llvm%%LLVM_SUFFIX%%/bin/bugpoint
%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-check
%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-cl
%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-cpp
%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clang-doc
%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-extdef-mapping
%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-format
%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-import-test
@ -2849,7 +2851,7 @@ llvm%%LLVM_SUFFIX%%/lib/libOptRemarks.so.%%LLVM_MAJOR%%
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a
%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangDaemon.a
%%CLANG%%%%DOCS%%llvm%%LLVM_SUFFIX%%/lib/libclangDoc.a
%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangDoc.a
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDriver.a
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDynamicASTMatchers.a
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangEdit.a