Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F156867043
D19068.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
4 KB
Referenced Files
None
Subscribers
None
D19068.diff
View Options
Index: head/devel/llvm70/Makefile
===================================================================
--- head/devel/llvm70/Makefile
+++ head/devel/llvm70/Makefile
@@ -180,6 +180,7 @@
EXTRAS_LIBS= libclangApplyReplacements \
libclangChangeNamespace \
libclangDaemon \
+ libclangDoc \
libclangIncludeFixer \
libclangMove \
libclangQuery \
@@ -529,7 +530,6 @@
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%%%%"} \
Index: head/devel/llvm70/pkg-plist
===================================================================
--- head/devel/llvm70/pkg-plist
+++ head/devel/llvm70/pkg-plist
@@ -2798,7 +2798,7 @@
%%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
Index: head/devel/llvm80/Makefile
===================================================================
--- head/devel/llvm80/Makefile
+++ head/devel/llvm80/Makefile
@@ -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 @@
EXTRAS_COMMANDS+= \
clang-apply-replacements \
clang-change-namespace \
+ clang-doc \
clang-include-fixer \
clang-modernize \
clang-query \
@@ -202,6 +203,7 @@
EXTRAS_LIBS= libclangApplyReplacements \
libclangChangeNamespace \
libclangDaemon \
+ libclangDoc \
libclangIncludeFixer \
libclangMove \
libclangQuery \
@@ -611,7 +613,6 @@
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%%%%"} \
Index: head/devel/llvm80/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt
===================================================================
--- head/devel/llvm80/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt
+++ head/devel/llvm80/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt
@@ -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)
Index: head/devel/llvm80/pkg-plist
===================================================================
--- head/devel/llvm80/pkg-plist
+++ head/devel/llvm80/pkg-plist
@@ -70,6 +70,7 @@
%%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 @@
%%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 @@
%%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
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, May 17, 11:54 PM (5 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33220227
Default Alt Text
D19068.diff (4 KB)
Attached To
Mode
D19068: devel/llvm70, devel/llvm80: fix libclangDoc.a installation, install clang-doc80
Attached
Detach File
Event Timeline
Log In to Comment