svn commit: r401840 - head/devel/llvm-devel
Brooks Davis
brooks at FreeBSD.org
Wed Nov 18 02:11:24 UTC 2015
Author: brooks
Date: Wed Nov 18 02:11:22 2015
New Revision: 401840
URL: https://svnweb.freebsd.org/changeset/ports/401840
Log:
Add the extra clang tools.
Modified:
head/devel/llvm-devel/Makefile
head/devel/llvm-devel/pkg-plist
Modified: head/devel/llvm-devel/Makefile
==============================================================================
--- head/devel/llvm-devel/Makefile Wed Nov 18 01:46:16 2015 (r401839)
+++ head/devel/llvm-devel/Makefile Wed Nov 18 02:11:22 2015 (r401840)
@@ -3,6 +3,7 @@
PORTNAME= llvm
PORTVERSION= ${LLVM_MAJOR}.d${SNAPDATE}
+PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -devel
@@ -29,9 +30,9 @@ GH_TAGNAME= ${LLVM_COMMIT}
.include "Makefile.snapshot"
-OPTIONS_DEFINE= CLANG DOCS GOLD LIT LLD LLDB
+OPTIONS_DEFINE= CLANG DOCS EXTRAS GOLD LIT LLD LLDB
OPTIONS_DEFINE_amd64= OPENMP
-OPTIONS_DEFAULT= CLANG GOLD LIT LLD LLDB
+OPTIONS_DEFAULT= CLANG EXTRAS GOLD LIT LLD LLDB
OPTIONS_DEFAULT_amd64= OPENMP
OPTIONS_SUB= yes
@@ -49,6 +50,10 @@ DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON
-DSPHINX_WARNINGS_AS_ERRORS=OFF \
-DLLVM_BUILD_DOCS=ON
DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
+EXTRAS_DESC= Extra clang tools
+EXTRAS_IMPLIES= CLANG
+EXTRAS_GH_PROJECT= clang-tools-extra:extras
+EXTRAS_GH_TAGNAME= ${EXTRAS_COMMIT}:extras
LIT_DESC= Install lit and FileCheck test tools
LLD_DESC= Install lld, the LLVM linker
LLD_GH_PROJECT= lld:lld
@@ -106,6 +111,25 @@ STRIP_LIBS= BugpointPasses.so \
${LIBNAME}.0 \
libLTO.so
+EXTRAS_COMMANDS= \
+ clang-apply-replacements \
+ clang-modernize \
+ clang-query \
+ clang-rename \
+ clang-tidy
+EXTRAS_LIBS= \
+ libclangApplyReplacements \
+ libclangQuery \
+ libclangRename \
+ libclangTidy \
+ libclangTidyGoogleModule \
+ libclangTidyLLVMModule \
+ libclangTidyMiscModule \
+ libclangTidyReadabilityModule \
+ libclangTidyUtils \
+ libmodernizeCore
+EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTRAS_LIBS:tW:C/ */|/g}
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCLANG}
@@ -121,6 +145,10 @@ MAN1SRCS+= clang.1 \
CLANG_PATTERN= (clang|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|six.py|-analyzer)
.endif
+.if ${PORT_OPTIONS:MEXTRAS}
+COMMANDS+= ${EXTRAS_COMMANDS}
+.endif
+
.if ${PORT_OPTIONS:MLIT}
MAN1SRCS+= lit.1 FileCheck.1
_USES_PYTHON= python
@@ -173,6 +201,9 @@ BROKEN= LLDB does not build with Python
post-extract-CLANG-on:
${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang
+post-extract-EXTRAS-on:
+ ${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang/tools/extra
+
post-extract-LLD-on:
${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
@@ -265,9 +296,10 @@ build-plist:
${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' | \
${SORT} >> ${PLIST}.tmp
awk '{ \
- if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} \
+ if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /omp.h|${EXTRAS_PATTERN}/) {printf "%%%%CLANG%%%%"} \
if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
- if ($$0 ~ /(lldb)/) {printf "%%%%LLDB%%%%"} \
+ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
+ if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} \
if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} \
if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
if ($$0 !~ /libclang_rt/) {print} \
Modified: head/devel/llvm-devel/pkg-plist
==============================================================================
--- head/devel/llvm-devel/pkg-plist Wed Nov 18 01:46:16 2015 (r401839)
+++ head/devel/llvm-devel/pkg-plist Wed Nov 18 02:11:22 2015 (r401840)
@@ -33,6 +33,11 @@ bin/opt-devel
%%CLANG%%bin/clang-format-devel
%%CLANG%%bin/scan-build-devel
%%CLANG%%bin/scan-view-devel
+%%EXTRAS%%bin/clang-apply-replacements-devel
+%%EXTRAS%%bin/clang-modernize-devel
+%%EXTRAS%%bin/clang-query-devel
+%%EXTRAS%%bin/clang-rename-devel
+%%EXTRAS%%bin/clang-tidy-devel
%%LLD%%bin/lld-devel
%%LLD%%bin/lld-link-devel
%%LLDB%%bin/lldb-devel
@@ -51,10 +56,15 @@ llvm-devel/bin/bugpoint
%%CLANG%%llvm-devel/bin/clang
%%CLANG%%llvm-devel/bin/clang++
%%CLANG%%llvm-devel/bin/clang-3.8
+%%EXTRAS%%llvm-devel/bin/clang-apply-replacements
%%CLANG%%llvm-devel/bin/clang-check
%%CLANG%%llvm-devel/bin/clang-cl
%%CLANG%%llvm-devel/bin/clang-cpp
%%CLANG%%llvm-devel/bin/clang-format
+%%EXTRAS%%llvm-devel/bin/clang-modernize
+%%EXTRAS%%llvm-devel/bin/clang-query
+%%EXTRAS%%llvm-devel/bin/clang-rename
+%%EXTRAS%%llvm-devel/bin/clang-tidy
%%CLANG%%llvm-devel/bin/git-clang-format
%%LLD%%llvm-devel/bin/ld.lld2
llvm-devel/bin/llc
@@ -2017,6 +2027,7 @@ llvm-devel/lib/libLTO.so
%%CLANG%%llvm-devel/lib/libclangAST.so
%%CLANG%%llvm-devel/lib/libclangASTMatchers.so
%%CLANG%%llvm-devel/lib/libclangAnalysis.so
+%%EXTRAS%%llvm-devel/lib/libclangApplyReplacements.so
%%CLANG%%llvm-devel/lib/libclangBasic.so
%%CLANG%%llvm-devel/lib/libclangCodeGen.so
%%CLANG%%llvm-devel/lib/libclangDriver.so
@@ -2028,6 +2039,8 @@ llvm-devel/lib/libLTO.so
%%CLANG%%llvm-devel/lib/libclangIndex.so
%%CLANG%%llvm-devel/lib/libclangLex.so
%%CLANG%%llvm-devel/lib/libclangParse.so
+%%EXTRAS%%llvm-devel/lib/libclangQuery.so
+%%EXTRAS%%llvm-devel/lib/libclangRename.so
%%CLANG%%llvm-devel/lib/libclangRewrite.so
%%CLANG%%llvm-devel/lib/libclangRewriteFrontend.so
%%CLANG%%llvm-devel/lib/libclangSema.so
@@ -2035,6 +2048,15 @@ llvm-devel/lib/libLTO.so
%%CLANG%%llvm-devel/lib/libclangStaticAnalyzerCheckers.so
%%CLANG%%llvm-devel/lib/libclangStaticAnalyzerCore.so
%%CLANG%%llvm-devel/lib/libclangStaticAnalyzerFrontend.so
+%%EXTRAS%%llvm-devel/lib/libclangTidy.so
+%%EXTRAS%%llvm-devel/lib/libclangTidyCERTModule.so
+%%EXTRAS%%llvm-devel/lib/libclangTidyCppCoreGuidelinesModule.so
+%%EXTRAS%%llvm-devel/lib/libclangTidyGoogleModule.so
+%%EXTRAS%%llvm-devel/lib/libclangTidyLLVMModule.so
+%%EXTRAS%%llvm-devel/lib/libclangTidyMiscModule.so
+%%EXTRAS%%llvm-devel/lib/libclangTidyModernizeModule.so
+%%EXTRAS%%llvm-devel/lib/libclangTidyReadabilityModule.so
+%%EXTRAS%%llvm-devel/lib/libclangTidyUtils.so
%%CLANG%%llvm-devel/lib/libclangTooling.so
%%CLANG%%llvm-devel/lib/libclangToolingCore.so
%%OPENMP%%llvm-devel/lib/libgomp.so
@@ -2136,6 +2158,7 @@ llvm-devel/lib/libLTO.so
%%LLDB%%llvm-devel/lib/liblldbSymbol.a
%%LLDB%%llvm-devel/lib/liblldbTarget.a
%%LLDB%%llvm-devel/lib/liblldbUtility.a
+%%EXTRAS%%llvm-devel/lib/libmodernizeCore.so
%%OPENMP%%llvm-devel/lib/libomp.so
%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/__init__.py
%%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/_lldb.so
@@ -2160,9 +2183,11 @@ llvm-devel/lib/libLTO.so
%%CLANG%%llvm-devel/share/clang/clang-format-sublime.py
%%CLANG%%llvm-devel/share/clang/clang-format.el
%%CLANG%%llvm-devel/share/clang/clang-format.py
+%%EXTRAS%%llvm-devel/share/clang/clang-tidy-diff.py
%%CLANG%%llvm-devel/share/clang/cmake/ClangConfig.cmake
%%CLANG%%llvm-devel/share/clang/cmake/ClangTargets-%%CMAKE_BUILD_TYPE%%.cmake
%%CLANG%%llvm-devel/share/clang/cmake/ClangTargets.cmake
+%%EXTRAS%%llvm-devel/share/clang/run-clang-tidy.py
llvm-devel/share/llvm/cmake/AddLLVM.cmake
llvm-devel/share/llvm/cmake/AddLLVMDefinitions.cmake
llvm-devel/share/llvm/cmake/AddOCaml.cmake
More information about the svn-ports-head
mailing list