Date: Tue, 11 Feb 2020 23:52:15 +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: r525893 - in head/devel/llvm10: . files/extras Message-ID: <202002112352.01BNqFuZ076206@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Tue Feb 11 23:52:14 2020 New Revision: 525893 URL: https://svnweb.freebsd.org/changeset/ports/525893 Log: Restore the clang EXTRAS option. Add a USES=lua for LLDB as it now picks up lua if installed. Let it know which version to link to since it seems to prefer 5.3 even when USES=lua prefers 5.2. Submitted by: C Williams Differential Revision: https://reviews.freebsd.org/D23583 Modified: head/devel/llvm10/Makefile head/devel/llvm10/files/extras/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt head/devel/llvm10/pkg-plist Modified: head/devel/llvm10/Makefile ============================================================================== --- head/devel/llvm10/Makefile Tue Feb 11 21:05:23 2020 (r525892) +++ head/devel/llvm10/Makefile Tue Feb 11 23:52:14 2020 (r525893) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 10.0.0rc1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang #MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/ MASTER_SITES= https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} @@ -64,11 +64,11 @@ CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON_CMD} \ CFLAGS+= -DNDEBUG CXXFLAGS+= -DNDEBUG -OPTIONS_DEFINE= BE_AMDGPU CLANG DOCS ELFV2 LIT LLD LLD_LINK LLDB PYCLANG +OPTIONS_DEFINE= BE_AMDGPU CLANG DOCS ELFV2 EXTRAS LIT LLD LLD_LINK LLDB PYCLANG OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPENMP OPTIONS_DEFINE_powerpc64= OPENMP -OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG LIT LLD LLD_LINK LLDB PYCLANG +OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK LLDB PYCLANG OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP OPTIONS_DEFAULT_powerpc64= ${PPC_ABI:tu:MELFV2} OPENMP @@ -129,6 +129,8 @@ LLD_LINK_DESC= Link ld.lld as ld to clang uses it LLD_LINK_IMPLIES= LLD LLDB_BUILD_DEPENDS= swig3.0:devel/swig30 \ ${PY_ENUM34} +LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=/usr/local/include/lua${LUA_VER_STR} \ + -DLUA_LIBRARY=/usr/local/lib/liblua-${LUA_VER}.so LLDB_DESC= Install lldb, the LLVM debugger LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} LLDB_EXTRA_PATCHES= ${PATCHDIR}/lldb @@ -282,6 +284,7 @@ PORTDOCS+= lld .if ${PORT_OPTIONS:MLLDB} COMMANDS+= ${LLDB_COMMANDS} MAN1SRCS+= lldb.1 +USES+= lua .endif OPENMP_PATTERN= libarcher|lib[ig]*omp|omp.h|ompt.h|omp-tools.h Modified: head/devel/llvm10/files/extras/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt ============================================================================== --- head/devel/llvm10/files/extras/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt Tue Feb 11 21:05:23 2020 (r525892) +++ head/devel/llvm10/files/extras/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt Tue Feb 11 23:52:14 2020 (r525893) @@ -1,7 +1,10 @@ ---- 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.orig 2020-01-30 15:29:37 UTC +++ tools/clang/tools/extra/clang-doc/tool/CMakeLists.txt -@@ -15,3 +15,4 @@ target_link_libraries(clang-doc - clangToolingCore +@@ -18,6 +18,7 @@ target_link_libraries(clang-doc + clangDoc ) - + +install(TARGETS clang-doc RUNTIME DESTINATION bin) + install(FILES ../assets/clang-doc-default-stylesheet.css + DESTINATION share/clang + COMPONENT clang-doc) Modified: head/devel/llvm10/pkg-plist ============================================================================== --- head/devel/llvm10/pkg-plist Tue Feb 11 21:05:23 2020 (r525892) +++ head/devel/llvm10/pkg-plist Tue Feb 11 23:52:14 2020 (r525893) @@ -69,6 +69,17 @@ bin/sancov%%LLVM_SUFFIX%% %%CLANG%%bin/hmaptool%%LLVM_SUFFIX%% %%CLANG%%bin/scan-build%%LLVM_SUFFIX%% %%CLANG%%bin/scan-view%%LLVM_SUFFIX%% +%%EXTRAS%%bin/clangd%%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-query%%LLVM_SUFFIX%% +%%EXTRAS%%bin/clang-reorder-fields%%LLVM_SUFFIX%% +%%EXTRAS%%bin/clang-tidy%%LLVM_SUFFIX%% +%%EXTRAS%%bin/find-all-symbols%%LLVM_SUFFIX%% +%%EXTRAS%%bin/modularize%%LLVM_SUFFIX%% +%%EXTRAS%%bin/pp-trace%%LLVM_SUFFIX%% %%LLD%%bin/ld.lld%%LLVM_SUFFIX%% %%LLD%%bin/ld64.lld%%LLVM_SUFFIX%% %%LLD%%bin/lld%%LLVM_SUFFIX%% @@ -110,20 +121,30 @@ llvm%%LLVM_SUFFIX%%/bin/bugpoint %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang++ %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-%%LLVM_MAJOR%% +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clang-apply-replacements +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clang-change-namespace %%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 +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clang-include-fixer +%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-move %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-offload-bundler %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-offload-wrapper +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clang-query %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-refactor %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-rename +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clang-reorder-fields %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-scan-deps %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-tblgen +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clang-tidy +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/clangd %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/diagtool llvm%%LLVM_SUFFIX%%/bin/dsymutil +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/find-all-symbols %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/git-clang-format %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/hmaptool %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld @@ -192,8 +213,10 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-symbolizer llvm%%LLVM_SUFFIX%%/bin/llvm-tblgen llvm%%LLVM_SUFFIX%%/bin/llvm-undname llvm%%LLVM_SUFFIX%%/bin/llvm-xray +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/modularize llvm%%LLVM_SUFFIX%%/bin/obj2yaml llvm%%LLVM_SUFFIX%%/bin/opt +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/pp-trace llvm%%LLVM_SUFFIX%%/bin/sancov llvm%%LLVM_SUFFIX%%/bin/sanstats %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/scan-build @@ -3068,11 +3091,16 @@ llvm%%LLVM_SUFFIX%%/lib/libarcher_static.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangASTMatchers.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAnalysis.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangApplyReplacements.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangBasic.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangChangeNamespace.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCodeGen.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangCrossTU.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangDaemon.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangDaemonTweaks.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDependencyScanning.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangDirectoryWatcher.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 @@ -3081,9 +3109,14 @@ llvm%%LLVM_SUFFIX%%/lib/libarcher_static.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangFrontendTool.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleCXX.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangHandleLLVM.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangIncludeFixer.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangIncludeFixerPlugin.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangIndex.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangLex.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangMove.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangParse.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangQuery.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangReorderFields.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangRewrite.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangRewriteFrontend.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangSema.a @@ -3091,6 +3124,30 @@ llvm%%LLVM_SUFFIX%%/lib/libarcher_static.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCheckers.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCore.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerFrontend.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidy.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyAbseilModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyAndroidModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyBoostModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyBugproneModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyCERTModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyCppCoreGuidelinesModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyDarwinModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyFuchsiaModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyGoogleModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyHICPPModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyLLVMModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyLinuxKernelModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyMPIModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyMiscModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyModernizeModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyObjCModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyOpenMPModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyPerformanceModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyPlugin.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyPortabilityModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyReadabilityModule.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyUtils.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangTidyZirconModule.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTooling.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingASTDiff.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingCore.a @@ -3098,6 +3155,7 @@ llvm%%LLVM_SUFFIX%%/lib/libarcher_static.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingRefactoring.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingSyntax.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTransformer.a +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libfindAllSymbols.a %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libgomp.so %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libiomp5.so %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCOFF.a @@ -3118,13 +3176,20 @@ llvm%%LLVM_SUFFIX%%/lib/libarcher_static.a %%CLANG%%llvm%%LLVM_SUFFIX%%/libexec/c++-analyzer %%CLANG%%llvm%%LLVM_SUFFIX%%/libexec/ccc-analyzer %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/bash-autocomplete.sh +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/share/clang/clang-doc-default-stylesheet.css %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/clang-format-bbedit.applescript %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/clang-format-diff.py %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/clang-format-sublime.py %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/clang-format.el %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/clang-format.py +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/share/clang/clang-include-fixer.el +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/share/clang/clang-include-fixer.py %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/clang-rename.el %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/clang-rename.py +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/share/clang/clang-tidy-diff.py +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/share/clang/index.js +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/share/clang/run-clang-tidy.py +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/share/clang/run-find-all-symbols.py llvm%%LLVM_SUFFIX%%/share/opt-viewer/opt-diff.py llvm%%LLVM_SUFFIX%%/share/opt-viewer/opt-stats.py llvm%%LLVM_SUFFIX%%/share/opt-viewer/opt-viewer.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002112352.01BNqFuZ076206>