Date: Mon, 25 Feb 2019 19:28:55 +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: r493890 - in head/devel: llvm70 llvm80 llvm80/files Message-ID: <201902251928.x1PJSter051870@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Mon Feb 25 19:28:55 2019 New Revision: 493890 URL: https://svnweb.freebsd.org/changeset/ports/493890 Log: Fix libclangDoc.a installation, install clang-doc80 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 Added: head/devel/llvm80/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt (contents, props changed) Modified: head/devel/llvm70/Makefile head/devel/llvm70/pkg-plist head/devel/llvm80/Makefile head/devel/llvm80/pkg-plist Modified: head/devel/llvm70/Makefile ============================================================================== --- head/devel/llvm70/Makefile Mon Feb 25 18:53:06 2019 (r493889) +++ head/devel/llvm70/Makefile Mon Feb 25 19:28:55 2019 (r493890) @@ -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%%%%"} \ Modified: head/devel/llvm70/pkg-plist ============================================================================== --- head/devel/llvm70/pkg-plist Mon Feb 25 18:53:06 2019 (r493889) +++ head/devel/llvm70/pkg-plist Mon Feb 25 19:28:55 2019 (r493890) @@ -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 Modified: head/devel/llvm80/Makefile ============================================================================== --- head/devel/llvm80/Makefile Mon Feb 25 18:53:06 2019 (r493889) +++ head/devel/llvm80/Makefile Mon Feb 25 19:28:55 2019 (r493890) @@ -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%%%%"} \ Added: head/devel/llvm80/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm80/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt Mon Feb 25 19:28:55 2019 (r493890) @@ -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) Modified: head/devel/llvm80/pkg-plist ============================================================================== --- head/devel/llvm80/pkg-plist Mon Feb 25 18:53:06 2019 (r493889) +++ head/devel/llvm80/pkg-plist Mon Feb 25 19:28:55 2019 (r493890) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902251928.x1PJSter051870>