Date: Thu, 31 Jan 2019 09:11:52 +0100 From: Tobias Kortkamp <tobik@freebsd.org> To: Brooks Davis <brooks@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r491658 - head/devel/llvm-cheri Message-ID: <20190131081149.GA52719@urd.tobik.me> In-Reply-To: <201901302120.x0ULK6rA080223@repo.freebsd.org> References: <201901302120.x0ULK6rA080223@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--M9NhX3UHpAaciwkO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > Fix DOCS build. > =20 > Add LICENSE info. > =20 > Sponsored by: DARPA, AFRL >=20 > Modified: > head/devel/llvm-cheri/Makefile >=20 > Modified: head/devel/llvm-cheri/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 @@ > =20 > PORTNAME=3D llvm > PORTVERSION=3D ${LLVM_MAJOR}.0.d${SNAPDATE} > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > CATEGORIES=3D devel lang > PKGNAMESUFFIX=3D ${LLVM_SUFFIX} > =20 > MAINTAINER=3D brooks@FreeBSD.org > COMMENT=3D LLVM and Clang with support for the CHERI architecture > =20 > +.include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" > + > BROKEN_powerpc64=3D Does not build > =20 > LLVM_SUFFIX?=3D -cheri > @@ -71,7 +73,12 @@ LLDB_BINARY_ALIAS=3D swig=3Dswig3.0 > LLDB_GH_PROJECT=3D lldb:lldb > LLDB_GH_TAGNAME=3D ${LLDB_COMMIT}:lldb > =20 > -DOCS_BUILD_DEPENDS=3D sphinx-build:textproc/py-sphinx > +DOCS_BUILD_DEPENDS=3D sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY= _FLAVOR} \ > + ${PYTHON_PKGNAMEPREFIX}recommonmark>=3D0.0.20180530:textproc/py-recom= monmark@${PY_FLAVOR} > +DOCS_CMAKE_ON=3D -DLLVM_ENABLE_SPHINX=3DON \ > + -DSPHINX_EXECUTABLE=3D${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ > + -DSPHINX_WARNINGS_AS_ERRORS=3DOFF \ > + -DLLVM_BUILD_DOCS=3DON 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. --M9NhX3UHpAaciwkO Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEElXvTEJc6ePgdQuobpPCftzzFH2EFAlxSrb1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk1 N0JEMzEwOTczQTc4RjgxRDQyRUExQkE0RjA5RkI3M0NDNTFGNjEACgkQpPCftzzF H2FMSwgAm0ieIIcqp+eWGAn/KZUn20GCF23gdis+NoByx0G+j5aMHL96r5Np/4Mu Xkss5Jk/Jku3Z+WmJHao+Wn38vP5eiOEyJkidXd/OfWNjqvqhj1NxlFtNMZoYiYe kRPXVTlviU6xhfiv8nyghv7cEy709mhfahVupN0c9uKTPek/DueibFFHFTx9CRun KkpEWWw1uFAphZvOZ5LxM+SNbWe0jRYLgNA9vDZrudbOQ00SWenBcUUo88I240KR D0W711t/6Anx6uUv6/QC4jNo2YKfuiyLUHzf8xmarUA1SnLt3SyQ4CwD5QexUIay 3B5/vJF4fE/fNK9AOd2jMB5HBHygAw== =h/jh -----END PGP SIGNATURE----- --M9NhX3UHpAaciwkO--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190131081149.GA52719>