On Sat, Sep 21, 2019 at 02:28:46PM +0200, Rafael Sadowski wrote:
> Long time ago I was trying to import the clang extra tool sets without
> luck. It failed because the -extra subpackage has an effect on -main.
> More precisely, the cmake parts from the main package.
>
> For this reason, I think it is best to build/install the extra tools in
> the main package. I'd be in charge here, too.
>
> I also was trying to crate an extra packages, which includes only the
> extra parts but this rise more issue in the eco system.
>
> I have to deal with this topic because more and more people come up to
> me and ask about my last try, last otto@. That's good because I think
> these tools are helpful.
>
> Best regards and a nice weekend.
Thanks, works for me.
-Otto
>
> RS
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/llvm/Makefile,v
> retrieving revision 1.234
> diff -u -p -u -p -r1.234 Makefile
> --- Makefile 9 Sep 2019 21:15:16 -0000 1.234
> +++ Makefile 21 Sep 2019 12:08:00 -0000
> @@ -18,7 +18,7 @@ PKGSPEC-main = llvm-=${LLVM_V}
> PKGNAME-main = llvm-${LLVM_V}
> PKGNAME-python = py-llvm-${LLVM_V}
> PKGNAME-lldb = lldb-${LLVM_V}
> -REVISION-main = 0
> +REVISION-main = 1
>
> CATEGORIES = devel
>
> @@ -40,7 +40,8 @@ EXTRACT_SUFX = .tar.xz
> DISTFILES = llvm-${LLVM_V}.src${EXTRACT_SUFX} \
> cfe-${LLVM_V}.src${EXTRACT_SUFX} \
> lld-${LLVM_V}.src${EXTRACT_SUFX} \
> - lldb-${LLVM_V}.src${EXTRACT_SUFX}
> + lldb-${LLVM_V}.src${EXTRACT_SUFX} \
> + clang-tools-extra-${LLVM_V}.src${EXTRACT_SUFX}
>
> MULTI_PACKAGES = -main -python -lldb
>
> @@ -131,6 +132,7 @@ post-extract:
> mv ${WRKDIR}/cfe-${LLVM_V}.src ${WRKSRC}/tools/clang
> mv ${WRKDIR}/lld-${LLVM_V}.src ${WRKSRC}/tools/lld
> mv ${WRKDIR}/lldb-${LLVM_V}.src ${WRKSRC}/tools/lldb
> + mv ${WRKDIR}/clang-tools-extra-${LLVM_V}.src
> ${WRKSRC}/tools/clang/tools/extra
>
> pre-configure:
> @${SUBST_CMD} ${WRKSRC}/tools/clang/lib/Driver/ToolChains/OpenBSD.cpp
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/llvm/distinfo,v
> retrieving revision 1.34
> diff -u -p -u -p -r1.34 distinfo
> --- distinfo 8 Sep 2019 10:40:39 -0000 1.34
> +++ distinfo 21 Sep 2019 12:08:00 -0000
> @@ -1,8 +1,10 @@
> SHA256 (cfe-8.0.1.src.tar.xz) = cO/9afeoqySfZrCmirqLCK9Sqiq3EN+4oPuhAmhbFkY=
> +SHA256 (clang-tools-extra-8.0.1.src.tar.xz) =
> GHF5thfk8Hu2BcwhXaBSfmSZC0p91cvMRSoWtk4Cw+E=
> SHA256 (lld-8.0.1.src.tar.xz) = n7oelCSb15E+imw6rcswi3bIw9g8XONsmcPzTXOHPYg=
> SHA256 (lldb-8.0.1.src.tar.xz) = 6Kebqm0R3QZQq0obR59pnfrYKvYny7zUn6by3BThMdc=
> SHA256 (llvm-8.0.1.src.tar.xz) = RHh6bQL3FA8UXiJQ1WyfhJM04R+a43mCdRDtcvErdec=
> SIZE (cfe-8.0.1.src.tar.xz) = 12810056
> +SIZE (clang-tools-extra-8.0.1.src.tar.xz) = 1994068
> SIZE (lld-8.0.1.src.tar.xz) = 996440
> SIZE (lldb-8.0.1.src.tar.xz) = 19586288
> SIZE (llvm-8.0.1.src.tar.xz) = 30477608
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/devel/llvm/pkg/PLIST-main,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 PLIST-main
> --- pkg/PLIST-main 8 Jul 2019 07:56:53 -0000 1.14
> +++ pkg/PLIST-main 21 Sep 2019 12:08:00 -0000
> @@ -5,17 +5,25 @@
> bin/clang
> bin/clang++
> @bin bin/clang-8
> +@bin bin/clang-apply-replacements
> +@bin bin/clang-change-namespace
> @bin bin/clang-check
> bin/clang-cl
> bin/clang-cpp
> @bin bin/clang-extdef-mapping
> @bin bin/clang-format
> @bin bin/clang-import-test
> +@bin bin/clang-include-fixer
> @bin bin/clang-offload-bundler
> +@bin bin/clang-query
> @bin bin/clang-refactor
> @bin bin/clang-rename
> +@bin bin/clang-reorder-fields
> +@bin bin/clang-tidy
> +@bin bin/clangd
> @bin bin/diagtool
> @bin bin/dsymutil
> +@bin bin/find-all-symbols
> bin/git-clang-format
> bin/hmaptool
> bin/ld.lld
> @@ -72,6 +80,7 @@ bin/llvm-strip
> @bin bin/llvm-tblgen
> @bin bin/llvm-undname
> @bin bin/llvm-xray
> +@bin bin/modularize
> @bin bin/obj2yaml
> @bin bin/opt
> @bin bin/sancov
> @@ -2349,9 +2358,13 @@ lib/libclangARCMigrate.a
> lib/libclangAST.a
> lib/libclangASTMatchers.a
> lib/libclangAnalysis.a
> +lib/libclangApplyReplacements.a
> lib/libclangBasic.a
> +lib/libclangChangeNamespace.a
> lib/libclangCodeGen.a
> lib/libclangCrossTU.a
> +lib/libclangDaemon.a
> +lib/libclangDoc.a
> lib/libclangDriver.a
> lib/libclangDynamicASTMatchers.a
> lib/libclangEdit.a
> @@ -2360,9 +2373,14 @@ lib/libclangFrontend.a
> lib/libclangFrontendTool.a
> lib/libclangHandleCXX.a
> lib/libclangHandleLLVM.a
> +lib/libclangIncludeFixer.a
> +lib/libclangIncludeFixerPlugin.a
> lib/libclangIndex.a
> lib/libclangLex.a
> +lib/libclangMove.a
> lib/libclangParse.a
> +lib/libclangQuery.a
> +lib/libclangReorderFields.a
> lib/libclangRewrite.a
> lib/libclangRewriteFrontend.a
> lib/libclangSema.a
> @@ -2370,6 +2388,27 @@ lib/libclangSerialization.a
> lib/libclangStaticAnalyzerCheckers.a
> lib/libclangStaticAnalyzerCore.a
> lib/libclangStaticAnalyzerFrontend.a
> +lib/libclangTidy.a
> +lib/libclangTidyAbseilModule.a
> +lib/libclangTidyAndroidModule.a
> +lib/libclangTidyBoostModule.a
> +lib/libclangTidyBugproneModule.a
> +lib/libclangTidyCERTModule.a
> +lib/libclangTidyCppCoreGuidelinesModule.a
> +lib/libclangTidyFuchsiaModule.a
> +lib/libclangTidyGoogleModule.a
> +lib/libclangTidyHICPPModule.a
> +lib/libclangTidyLLVMModule.a
> +lib/libclangTidyMPIModule.a
> +lib/libclangTidyMiscModule.a
> +lib/libclangTidyModernizeModule.a
> +lib/libclangTidyObjCModule.a
> +lib/libclangTidyPerformanceModule.a
> +lib/libclangTidyPlugin.a
> +lib/libclangTidyPortabilityModule.a
> +lib/libclangTidyReadabilityModule.a
> +lib/libclangTidyUtils.a
> +lib/libclangTidyZirconModule.a
> lib/libclangTooling.a
> @comment lib/libgtest.a
> @comment lib/libgtest_main.a
> @@ -2377,6 +2416,7 @@ lib/libclangToolingASTDiff.a
> lib/libclangToolingCore.a
> lib/libclangToolingInclusions.a
> lib/libclangToolingRefactor.a
> +lib/libfindAllSymbols.a
> lib/liblldCOFF.a
> lib/liblldCommon.a
> lib/liblldCore.a
> @@ -2426,8 +2466,13 @@ share/clang/clang-format-diff.py
> share/clang/clang-format-sublime.py
> share/clang/clang-format.el
> share/clang/clang-format.py
> +share/clang/clang-include-fixer.el
> +share/clang/clang-include-fixer.py
> share/clang/clang-rename.el
> share/clang/clang-rename.py
> +share/clang/clang-tidy-diff.py
> +share/clang/run-clang-tidy.py
> +share/clang/run-find-all-symbols.py
> share/doc/pkg-readmes/${PKGSTEM}
> share/opt-viewer/
> share/opt-viewer/opt-diff.py
>
