On Thu May 23, 2024 at 02:02:59AM GMT, Kirill A. Korinsky wrote:
> On Wed, 22 May 2024 20:43:29 +0100,
> Rafael Sadowski <raf...@sizeofvoid.org> wrote:
> >
> > User test and feedback welcome.
> >
>
> 1) I've added build dependency to devel/llvm/${MODCLANG_VERSION} because
> without it port fails on my system as:
>
> ===> Verifying specs: c++ c++abi pthread c m llvm16/lib/clang-cpp
> Missing library for llvm16/lib/clang-cpp>=0.0
> Fatal error
Yes I missed the in the last minute. Thanks.
>
> anyway make port-lib-depends-check complains as:
>
> clang-tools-extra-16.0.6(devel/clang-tools-extra):
> Bogus WANTLIB: clang-cpp.0 (/usr/local/bin/pp-trace) (NOT REACHABLE)
> *** Error 1 in target 'port-lib-depends-check' (ignored)
Unfortunately, this is normal. port-lib-depends-check can not handle
non-standard lib paths. How I wish someone would improve this.
>
> 2) I've added clang-format as target because devel/llvm installs
> clang-format-XX, and this port seems the right way to install just some
> clang-format.
Perfect!
>
> 3) The port contains a few hardcoded 16 which, perhabs, can be replaced to
> some variable. MODCLANG_VERSION good candidate, but it should be synced with
> LLVM_V that makes things quite ugly.
>
I have deliberately omitted MODCLANG_VERSION. I want to set the version
myself.
> Suggested changes:
Thanks looks good!
>
> diff --git devel/clang-tools-extra/Makefile devel/clang-tools-extra/Makefile
> index 2138376d15b..bdd70404783 100644
> --- devel/clang-tools-extra/Makefile
> +++ devel/clang-tools-extra/Makefile
> @@ -47,7 +47,8 @@ CONFIGURE_STYLE = cmake
> WRKDIST = ${WRKDIR}/llvm-project-${LLVM_V}.src
> WRKSRC = ${WRKDIR}/llvm-project-${LLVM_V}.src/llvm
>
> -BUILD_DEPENDS += devel/swig \
> +BUILD_DEPENDS += devel/llvm/${MODCLANG_VERSION} \
> + devel/swig \
> textproc/py-sphinx${MODPY_FLAVOR} \
> textproc/py-recommonmark${MODPY_FLAVOR}
>
> @@ -107,9 +108,10 @@ SUBST_VARS += OPENBSD_LD_IS_LLD
>
> MODCMAKE_LDFLAGS = -L${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
> -Wl,-rpath=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
>
> -ALL_TARGET = clang-change-namespace clang-apply-replacements clang-doc
> -ALL_TARGET += clang-include-fixer clang-move clang-query
> clang-reorder-fields
> -ALL_TARGET += clang-tidy clangd modularize pp-trace tool-template
> find-all-symbols
> +ALL_TARGET = clang-change-namespace clang-apply-replacements
> +ALL_TARGET += clang-doc clang-format clang-include-fixer clang-move
> +ALL_TARGET += clang-query clang-reorder-fields clang-tidy clangd
> +ALL_TARGET += modularize pp-trace tool-template find-all-symbols
>
> pre-configure:
> ${SUBST_CMD} ${WRKDIST}/clang/lib/Driver/ToolChains/OpenBSD.cpp \
> diff --git devel/clang-tools-extra/pkg/PLIST devel/clang-tools-extra/pkg/PLIST
> index 724abf03ecb..93a75259f73 100644
> --- devel/clang-tools-extra/pkg/PLIST
> +++ devel/clang-tools-extra/pkg/PLIST
> @@ -1,6 +1,7 @@
> @bin bin/clang-apply-replacements
> @bin bin/clang-change-namespace
> @bin bin/clang-doc
> +@bin bin/clang-format
> @bin bin/clang-include-fixer
> @bin bin/clang-move
> @bin bin/clang-query
> @@ -8,11 +9,17 @@
> @bin bin/clang-tidy
> @bin bin/clangd
> @bin bin/find-all-symbols
> +bin/git-clang-format
> @bin bin/modularize
> @bin bin/pp-trace
> bin/run-clang-tidy
> share/clang/
> share/clang/clang-doc-default-stylesheet.css
> +share/clang/clang-format-bbedit.applescript
> +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-tidy-diff.py
>
>
> --
> wbr, Kirill
>
