From nobody Tue Oct 05 01:43:39 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D796F17E1C9C; Tue, 5 Oct 2021 01:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HNgNC5kvrz57jR; Tue, 5 Oct 2021 01:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4E1324009; Tue, 5 Oct 2021 01:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1951hdOB073026; Tue, 5 Oct 2021 01:43:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1951hdtP073025; Tue, 5 Oct 2021 01:43:39 GMT (envelope-from git) Date: Tue, 5 Oct 2021 01:43:39 GMT Message-Id: <202110050143.1951hdtP073025@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 198a03aeba74 - 2021Q4 - devel/cmake: Revert "devel/cmake: fix build with python 3.10 as default" List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 198a03aeba74e852a6fa4a5161a056a3e741dc91 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=198a03aeba74e852a6fa4a5161a056a3e741dc91 commit 198a03aeba74e852a6fa4a5161a056a3e741dc91 Author: Yasuhiro Kimura AuthorDate: 2021-09-30 04:37:46 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-05 01:43:14 +0000 devel/cmake: Revert "devel/cmake: fix build with python 3.10 as default" This reverts commit 913219385dfdf72232e6beefe287377cfebdfb04. Previously build of cmake failed if 3.10 is default version of Python. And it was worked around by limiting the range of Python to 3.6-3.9. The source of the build error is runtime error of textproc/py-sphinx with Python 3.10. But it is already fixed and workaround isn't necessary any more. So revert the commit corresponding to it. PR: 258798 Approved by: adridg (kde@), ygy (mentor) MFH: 2021Q4 Differential Revision: https://reviews.freebsd.org/D32282 (cherry picked from commit 272477b09c9f9ef3e18250f14dd4dea1f90698fe) --- devel/cmake/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 85be41cc8087..1a7938407e4c 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -35,9 +35,8 @@ OPTIONS_DEFINE= DOCS MANPAGES CPACK OPTIONS_DEFAULT=MANPAGES OPTIONS_SUB= yes -MANPAGES_USES= python:3.6-3.9,env -MANPAGES_BUILD_DEPENDS= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} -MANPAGES_VARS= BINARY_ALIAS=sphinx-build=sphinx-build-${PYTHON_VER} +MANPAGES_USES= python:env +MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx MANPAGES_CONFIGURE_ON= --sphinx-man CPACK_DESC= Enable FreeBSD generator in CPack (experimental)