On 2017/01/04 21:27, Alexander Bluhm wrote:
> On Wed, Jan 04, 2017 at 10:25:56AM +0000, Stuart Henderson wrote:
> > So if splitting, it would be good to also
> > move those scripts and associated files to the -python subpackage.
>
> I will think about this in a second step. At the moment I don't
> know which files would I have to move.
>
> > To do this, use "PKGNAME-main=llvm-${LLVM_V}".
> > You also need "@pkgpath devel/llvm" in PLIST-main
> > ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py
> > ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/clang
> > so I would also remove the "PKG_ARCH-python = *".
>
> done, new diff. ok?
>
> bluhm
>
> Index: devel/llvm/Makefile
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/devel/llvm/Makefile,v
> retrieving revision 1.129
> diff -u -p -r1.129 Makefile
> --- devel/llvm/Makefile 1 Jan 2017 10:48:58 -0000 1.129
> +++ devel/llvm/Makefile 4 Jan 2017 19:56:52 -0000
> @@ -7,11 +7,15 @@ ONLY_FOR_ARCHS = ${LLVM_ARCHS}
>
> DPB_PROPERTIES = parallel
>
> -COMMENT = modular, fast C/C++/ObjC compiler, static analyzer and tools
> +MULTI_PACKAGES = -main -python
> +COMMENT-main = modular, fast C/C++/ObjC compiler, static analyzer and
> tools
> +COMMENT-python = python bindings for clang
>
> LLVM_V = 3.9.1
> DISTNAME = llvm-${LLVM_V}.src
> PKGNAME = llvm-${LLVM_V}
> +PKGNAME-main = llvm-${LLVM_V}
> +PKGNAME-python = llvm-python-${LLVM_V}
Oh - I just had a thought about naming of the -python package; to cope with
any future change to add python 3 support, I think it may be better to name
this "py-llvm-3.9.1" (the python ports and module have some scaffolding
for py- / py3- prefixes for package names), so
PKGNAME-python = py-llvm-${LLVM_V}
> CATEGORIES = devel
> DISTFILES = llvm-${LLVM_V}.src${EXTRACT_SUFX} \
> cfe-${LLVM_V}.src${EXTRACT_SUFX} \
> @@ -46,6 +50,10 @@ BUILD_DEPENDS += textproc/py-sphinx
> RUN_DEPENDS += devel/gtest \
> lang/gcc/${MODGCC4_VERSION},-c++
>
> +WANTLIB-python =
> +RUN_DEPENDS-python = lang/python/${MODPY_VERSION}
Sorry I missed this before, please use the variable from python.port.mk
for this :
RUN_DEPENDS-python = ${MODPY_RUN_DEPENDS}
You will also need to bump REVISION in x11/gnome/builder/Makefile (it
has a library dependency on devel/llvm for libclang.so).
Otherwise I'm OK with this.
Any comments Brad?
