On 2019/04/24 20:00, Jeremie Courreges-Anglas wrote:
> On Tue, Apr 16 2019, Rafael Sadowski <[email protected]> wrote:
> > On Tue Apr 02, 2019 at 11:08:13AM +0200, Jeremie Courreges-Anglas wrote:
>
> [...]
>
> >> Hmmk so using just ON/OFF just looks cleaner. Unless someone goes on
> >> a rampage to unify all cmake CONFIGURE_ARGS in the tree, I'd prefer to
> >> minimize churn and keep llvm consistent.
> >>
> >> >>
> >> >> > - Set CLANG_ENABLE_STATIC_ANALYZER=True, CLANG_INCLUDE_TESTS=True to
> >> >> > build clang-tidy and enable test. (It is ignored if the folder extra
> >> >> > don't exists)
>
> I had to look up whether specifying -DCLANG_INCLUDE_TESTS=True
> and -DCLANG_ENABLE_STATIC_ANALYZER=True would change the content of
> other subpackages. Both appear ON by default, so I see no need to
> specify them.
>
> >> >> > - Adjust WANTLIB
>
> Thanks.
>
> [...]
>
> > New diff with following changes:
> >
> > - Rename extras to clang-extras
>
> I was only suggesting renaming the PKGNAME, not renaming the subpackage
> and all affiliated variables. Thinking about it some more, I prefer
> naming the package like done upstream: clang-tools-extra.
>
> > - More generic aka. lazy DESCR
> > - Sorted PLIST
>
> Looks good, here's an updated diff that:
> - keeps -extras as the subpackage name
> - renames the produced package to clang-tools-extra
> - fixes PSEUDO_FLAVORS
> - amends DESCR (missing word, "tool" is repeated)
>
> Like sthen I wonder whether all those .a archives are useful.
> *shrug*
>
> Previous versions of this diff have been tested on amd64 and sparc64.
> ok jca@
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/llvm/Makefile,v
> retrieving revision 1.216
> diff -u -p -r1.216 Makefile
> --- Makefile 9 Mar 2019 06:18:11 -0000 1.216
> +++ Makefile 24 Apr 2019 16:22:45 -0000
> @@ -8,9 +8,10 @@ ONLY_FOR_ARCHS = ${LLVM_ARCHS}
>
> DPB_PROPERTIES = parallel
>
> -MULTI_PACKAGES = -main -python -lldb
> +MULTI_PACKAGES = -main -python -lldb -extras
> COMMENT-main = modular, fast C/C++/ObjC compiler, static analyzer and
> tools
> COMMENT-lldb = LLDB debugger
> +COMMENT-extras = clang extra tools
usual capitalisation is Clang, I'd prefer to stick to that (especially
with it done like that for -python).
> COMMENT-python = Python bindings for Clang
>
> LLVM_V = 7.0.1
> @@ -20,13 +21,15 @@ PKGSPEC-main = llvm-=${LLVM_V}
> PKGNAME-main = llvm-${LLVM_V}
> PKGNAME-python = py-llvm-${LLVM_V}
> PKGNAME-lldb = lldb-${LLVM_V}
> +PKGNAME-extras = clang-tools-extra-${LLVM_V}
> REVISION-main = 9
> REVISION-lldb = 0
-main and -lldb both need bumps.
> CATEGORIES = devel
> 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}
> MASTER_SITES = https://www.llvm.org/releases/${LLVM_V}/
this immediately redirects to http://releases.llvm.org/7.0.1/ now
(non https); MASTER_SITES could be updated to
https://releases.llvm.org/${LLVM_V}/
Otherwise OK sthen.
> EXTRACT_SUFX = .tar.xz
>
> @@ -42,10 +45,10 @@ MAINTAINER= Jeremie Courreges-Anglas <jc
> # BSD
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB = ${COMPILER_LIBCXX} c curses edit form m panel pthread \
> +WANTLIB = ${COMPILER_LIBCXX} c edit form m panel pthread \
> ${MODPY_WANTLIB} z
>
> -PSEUDO_FLAVORS = no_lldb
> +PSEUDO_FLAVORS = no_lldb no_extras
> FLAVOR ?=
> NOT_FOR_ARCHS-lldb = ${GCC4_ARCHS}
>
> @@ -72,12 +75,16 @@ WANTLIB-python = clang
> RUN_DEPENDS-python = ${MODPY_RUN_DEPENDS}
> LIB_DEPENDS-python = ${BUILD_PKGPATH},-main
>
> -WANTLIB-lldb = clang
> +WANTLIB-lldb = ${COMPILER_LIBCXX} clang c curses edit form m
> panel
> +WANTLIB-lldb += ${MODPY_WANTLIB}
> LIB_DEPENDS-lldb = ${BUILD_PKGPATH},-main
> RUN_DEPENDS-lldb = ${MODPY_RUN_DEPENDS} \
> devel/py-six
>
> -SEPARATE_BUILD = Yes
> +WANTLIB-extras = ${COMPILER_LIBCXX} c m clang
> +LIB_DEPENDS-extras = ${BUILD_PKGPATH},-main
> +RUN_DEPENDS-extras = ${MODPY_RUN_DEPENDS}
> +
> CONFIGURE_ARGS = -DLLVM_ENABLE_FFI:Bool=False \
> -DLLVM_ENABLE_TERMINFO:Bool=False \
> -DLLVM_ENABLE_RTTI:Bool=True \
> @@ -111,7 +118,7 @@ PKG_ARGS += -Dpowerpc=1
> PKG_ARGS += -Dpowerpc=0
> .endif
>
> -TEST_TARGET = check
> +TEST_TARGET = check check-clang check-clang-tools
>
> # XXX sync
> GCC_VER = 4.9.4
> @@ -127,12 +134,16 @@ 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
> -@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
> .if !${BUILD_PACKAGES:M-lldb}
> rm -r ${WRKSRC}/tools/lldb
> +.endif
> +.if !${BUILD_PACKAGES:M-extras}
> + rm -r ${WRKSRC}/tools/clang/tools/extra
> .endif
>
> post-build:
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/llvm/distinfo,v
> retrieving revision 1.30
> diff -u -p -r1.30 distinfo
> --- distinfo 28 Jan 2019 06:27:28 -0000 1.30
> +++ distinfo 24 Apr 2019 16:22:45 -0000
> @@ -1,8 +1,10 @@
> SHA256 (cfe-7.0.1.src.tar.xz) = pFti3eXX1f3N+odrCvkvFk1DSwbp6JtdCxy8Zd/j9Bg=
> +SHA256 (clang-tools-extra-7.0.1.src.tar.xz) =
> TJPH0rsHkjqLJy2j73kUQ4CArraTcl9PxcGc0OJhO+0=
> SHA256 (lld-7.0.1.src.tar.xz) = iGmqst0tjgDWmUM1LTFm0VnX6uJhX2amhPSgmZ/HQDE=
> SHA256 (lldb-7.0.1.src.tar.xz) = drRr51tBKj0i8NJieTBq5+J0/k15iKIYTFKcOKanaYI=
> SHA256 (llvm-7.0.1.src.tar.xz) = o438TbRxAux53MKqYek3IsX28G8KlhBzvYS3j7lJQZs=
> SIZE (cfe-7.0.1.src.tar.xz) = 12488668
> +SIZE (clang-tools-extra-7.0.1.src.tar.xz) = 901368
> SIZE (lld-7.0.1.src.tar.xz) = 912812
> SIZE (lldb-7.0.1.src.tar.xz) = 19384628
> SIZE (llvm-7.0.1.src.tar.xz) = 28311056
> Index: pkg/DESCR-extras
> ===================================================================
> RCS file: pkg/DESCR-extras
> diff -N pkg/DESCR-extras
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/DESCR-extras 24 Apr 2019 16:22:45 -0000
> @@ -0,0 +1,2 @@
> +The clang-tools-extra package contains helpful developer tools using
> +Clang's APIs.
> Index: pkg/PLIST-extras
> ===================================================================
> RCS file: pkg/PLIST-extras
> diff -N pkg/PLIST-extras
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/PLIST-extras 24 Apr 2019 16:22:45 -0000
> @@ -0,0 +1,46 @@
> +@comment $OpenBSD: PLIST-extras,v$
> +@bin bin/clang-apply-replacements
> +@bin bin/clang-change-namespace
> +@bin bin/clang-include-fixer
> +@bin bin/clang-query
> +@bin bin/clang-reorder-fields
> +@bin bin/clang-tidy
> +@bin bin/clangd
> +@bin bin/find-all-symbols
> +@bin bin/modularize
> +lib/libclangApplyReplacements.a
> +lib/libclangChangeNamespace.a
> +lib/libclangDaemon.a
> +lib/libclangDoc.a
> +lib/libclangIncludeFixer.a
> +lib/libclangIncludeFixerPlugin.a
> +lib/libclangMove.a
> +lib/libclangQuery.a
> +lib/libclangReorderFields.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/libfindAllSymbols.a
> +share/clang/clang-include-fixer.el
> +share/clang/clang-include-fixer.py
> +share/clang/clang-tidy-diff.py
> +share/clang/run-clang-tidy.py
> +share/clang/run-find-all-symbols.py
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
