From owner-svn-ports-all@freebsd.org Thu Jan 31 08:12:00 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 088FF134C98A; Thu, 31 Jan 2019 08:12:00 +0000 (UTC) (envelope-from tobik@freebsd.org) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BCDF76C07; Thu, 31 Jan 2019 08:11:59 +0000 (UTC) (envelope-from tobik@freebsd.org) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id B769D22012; Thu, 31 Jan 2019 03:11:53 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 31 Jan 2019 03:11:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=/lqK+u Y1HG0jmfcLWwmWBUoDUAvyDnmcGHCbfbG29Rs=; b=fMbxBHEkP8lhBI6GG8hxSi 083JrC2gwIFrFB60F60B8YGjUYIO7CybRphMe6wbv3qcBvAHhuJH9rQlNLi4In34 V0g02Pi/EPu0B/Qca+wtnE4exagnPC42xkM+KRCtca0ZErPrjRGKRi+0e/SsANhn VDSzNzuocl/5H/AuQcIg2DUNmI/+7gieUqrur13l7KKgRtcJuyYHa8U1VyGLX2mr iqLSnCrqAB8y5cUqcxXeX47Ub74OvDbux9EaDxt1HqmG0v81IFrcYqBV5neeZ0QW c6Z0lvy0Nc6wL+74kfIfUd/WMaey4QpdaAkOGpi8uEjtNLUXuT3eMRuHhkHsa6EQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrjeehgdduudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpeffhffvuffkfh ggtggujggfsehgtderredtredvnecuhfhrohhmpefvohgsihgrshcumfhorhhtkhgrmhhp uceothhosghikhesfhhrvggvsghsugdrohhrgheqnecuffhomhgrihhnpehfrhgvvggssh gurdhorhhgnecukfhppeefuddrudejrddvhedurdektdenucfrrghrrghmpehmrghilhhf rhhomhepthhosghikhesfhhrvggvsghsugdrohhrghenucevlhhushhtvghrufhiiigvpe dt X-ME-Proxy: Received: from urd.tobik.me (ip1f11fb50.dynamic.kabel-deutschland.de [31.17.251.80]) by mail.messagingengine.com (Postfix) with ESMTPA id 44478E424F; Thu, 31 Jan 2019 03:11:52 -0500 (EST) Date: Thu, 31 Jan 2019 09:11:52 +0100 From: Tobias Kortkamp To: Brooks Davis 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> References: <201901302120.x0ULK6rA080223@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="M9NhX3UHpAaciwkO" Content-Disposition: inline In-Reply-To: <201901302120.x0ULK6rA080223@repo.freebsd.org> User-Agent: Mutt/1.11.2 (2019-01-07) X-Rspamd-Queue-Id: 4BCDF76C07 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2019 08:12:00 -0000 --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--