Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Oct 2021 01:43:39 GMT
From:      Yasuhiro Kimura <yasu@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 198a03aeba74 - 2021Q4 - devel/cmake: Revert "devel/cmake: fix build with python 3.10 as default"
Message-ID:  <202110050143.1951hdtP073025@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q4 has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=198a03aeba74e852a6fa4a5161a056a3e741dc91

commit 198a03aeba74e852a6fa4a5161a056a3e741dc91
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2021-09-30 04:37:46 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110050143.1951hdtP073025>