svn commit: r491658 - head/devel/llvm-cheri

[Tobias Kortkamp]

On Wed, Jan 30, 2019 at 09:20:06PM +0000, Brooks Davis wrote:
> Author: brooks
> Date: Wed Jan 30 21:20:06 2019
> New Revision: 491658
> URL: https://svnweb.freebsd.org/changeset/ports/491658
> 
> Log:
>   Fix DOCS build.
>   
>   Add LICENSE info.
>   
>   Sponsored by:	DARPA, AFRL
> 
> Modified:
>   head/devel/llvm-cheri/Makefile
> 
> Modified: head/devel/llvm-cheri/Makefile
> ==============================================================================
> --- head/devel/llvm-cheri/Makefile	Wed Jan 30 20:42:44 2019	(r491657)
> +++ head/devel/llvm-cheri/Makefile	Wed Jan 30 21:20:06 2019	(r491658)
> @@ -2,13 +2,15 @@
>  
>  PORTNAME=	llvm
>  PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
> -PORTREVISION=	1
> +PORTREVISION=	2
>  CATEGORIES=	devel lang
>  PKGNAMESUFFIX=	${LLVM_SUFFIX}
>  
>  MAINTAINER=	brooks at FreeBSD.org
>  COMMENT=	LLVM and Clang with support for the CHERI architecture
>  
> +.include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
> +
>  BROKEN_powerpc64=	Does not build
>  
>  LLVM_SUFFIX?=	-cheri
> @@ -71,7 +73,12 @@ LLDB_BINARY_ALIAS=	swig=swig3.0
>  LLDB_GH_PROJECT=	lldb:lldb
>  LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
>  
> -DOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
> +DOCS_BUILD_DEPENDS=	sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} \
> +			${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
> +DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
> +			-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
> +			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
> +			-DLLVM_BUILD_DOCS=ON

Hi,

the port now sets DOCS_CMAKE_ON twice and they are slightly different.
Which DOCS_CMAKE_ON is correct and which one can be removed?  It
might be nice to move this into the correct place too to the other
DOCS_* helpers to avoid future mistakes and to ease port readability.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20190131/306a5596/attachment.sig>