Date: Mon, 18 May 2020 21:50:29 +0000 (UTC) From: "Danilo G. Baio" <dbaio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535791 - in head: devel/llvm-cheri devel/llvm-devel devel/llvm10 devel/llvm60 devel/llvm70 devel/llvm80 devel/llvm90 textproc/py-recommonmark Message-ID: <202005182150.04ILoTDw023375@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Mon May 18 21:50:29 2020 New Revision: 535791 URL: https://svnweb.freebsd.org/changeset/ports/535791 Log: devel/llvm*: Upgrade Sphinx dependency to 3.X This avoids conflicts between Sphinx ports when not using Poudriere. PR: 246500 Approved by: brooks (maintainer) Modified: head/devel/llvm-cheri/Makefile head/devel/llvm-devel/Makefile head/devel/llvm10/Makefile head/devel/llvm60/Makefile head/devel/llvm70/Makefile head/devel/llvm80/Makefile head/devel/llvm90/Makefile head/textproc/py-recommonmark/Makefile Modified: head/devel/llvm-cheri/Makefile ============================================================================== --- head/devel/llvm-cheri/Makefile Mon May 18 21:48:23 2020 (r535790) +++ head/devel/llvm-cheri/Makefile Mon May 18 21:50:29 2020 (r535791) @@ -266,6 +266,10 @@ post-patch: -e 's|lit\.|lit${LLVM_SUFFIX}.|' \ ${WRKSRC}/llvm/utils/lit/lit.py ${WRKSRC}/llvm/utils/lit/lit/*.py +post-patch-LLD-on: + ${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \ + ${PATCH_WRKSRC}/lld/docs/conf.py + post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/ ${INSTALL_DATA} ${WRKDIR}/mips-cheri-clang.mk \ Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Mon May 18 21:48:23 2020 (r535790) +++ head/devel/llvm-devel/Makefile Mon May 18 21:50:29 2020 (r535791) @@ -100,7 +100,7 @@ COMPILER_RT_IMPLIES= CLANG COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_PORTDOCS= llvm -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ ${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} \ @@ -370,6 +370,10 @@ post-patch-CLANG-on: ${PATCH_WRKSRC}/clang/tools/clang-format/clang-format.py \ ${PATCH_WRKSRC}/clang/tools/clang-format/clang-format-sublime.py \ ${PATCH_WRKSRC}/clang/tools/clang-format/git-clang-format + +post-patch-LLD-on: + ${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \ + ${PATCH_WRKSRC}/lld/docs/conf.py post-install: ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ Modified: head/devel/llvm10/Makefile ============================================================================== --- head/devel/llvm10/Makefile Mon May 18 21:48:23 2020 (r535790) +++ head/devel/llvm10/Makefile Mon May 18 21:50:29 2020 (r535791) @@ -105,7 +105,7 @@ COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src$ COMPILER_RT_EXTRA_PATCHES= ${PATCHDIR}/compiler-rt COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CONFLICTS_BUILD= commonmark-cmark-* DOCS_PORTDOCS= llvm @@ -478,6 +478,10 @@ post-patch-CLANG-on: ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format + +post-patch-LLD-on: + ${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \ + ${PATCH_WRKSRC}/tools/lld/docs/conf.py post-build-COMPILER_RT-on: ${MKDIR} ${WRKDIR}/compiler-rt-build Modified: head/devel/llvm60/Makefile ============================================================================== --- head/devel/llvm60/Makefile Mon May 18 21:48:23 2020 (r535790) +++ head/devel/llvm60/Makefile Mon May 18 21:50:29 2020 (r535791) @@ -67,7 +67,7 @@ CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx18 +DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ @@ -313,6 +313,10 @@ post-patch-CLANG-on: ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format + +post-patch-LLD-on: + ${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \ + ${PATCH_WRKSRC}/tools/lld/docs/conf.py post-build-COMPILER_RT-on: ${MKDIR} ${WRKDIR}/compiler-rt-build Modified: head/devel/llvm70/Makefile ============================================================================== --- head/devel/llvm70/Makefile Mon May 18 21:48:23 2020 (r535790) +++ head/devel/llvm70/Makefile Mon May 18 21:50:29 2020 (r535791) @@ -69,7 +69,7 @@ COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx18 +DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ @@ -333,6 +333,10 @@ post-patch-CLANG-on: ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format + +post-patch-LLD-on: + ${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \ + ${PATCH_WRKSRC}/tools/lld/docs/conf.py post-build-COMPILER_RT-on: ${MKDIR} ${WRKDIR}/compiler-rt-build Modified: head/devel/llvm80/Makefile ============================================================================== --- head/devel/llvm80/Makefile Mon May 18 21:48:23 2020 (r535790) +++ head/devel/llvm80/Makefile Mon May 18 21:50:29 2020 (r535791) @@ -85,7 +85,7 @@ COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CONFLICTS_BUILD= commonmark-cmark-* DOCS_PORTDOCS= llvm @@ -401,6 +401,10 @@ post-extract-LLDB-on: post-extract-OPENMP-on: ${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/projects/openmp + +post-patch-LLD-on: + ${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \ + ${PATCH_WRKSRC}/tools/lld/docs/conf.py post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \ Modified: head/devel/llvm90/Makefile ============================================================================== --- head/devel/llvm90/Makefile Mon May 18 21:48:23 2020 (r535790) +++ head/devel/llvm90/Makefile Mon May 18 21:50:29 2020 (r535791) @@ -93,7 +93,7 @@ COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR} \ +DOCS_BUILD_DEPENDS= ${PY_SPHINX} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CONFLICTS_BUILD= commonmark-cmark-* DOCS_PORTDOCS= llvm @@ -453,6 +453,10 @@ post-patch-CLANG-on: ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format + +post-patch-LLD-on: + ${REINPLACE_CMD} -e "s|\'indexsidebar.html\'|[\'indexsidebar.html\']|" \ + ${PATCH_WRKSRC}/tools/lld/docs/conf.py post-build-COMPILER_RT-on: ${MKDIR} ${WRKDIR}/compiler-rt-build Modified: head/textproc/py-recommonmark/Makefile ============================================================================== --- head/textproc/py-recommonmark/Makefile Mon May 18 21:48:23 2020 (r535790) +++ head/textproc/py-recommonmark/Makefile Mon May 18 21:50:29 2020 (r535791) @@ -2,7 +2,7 @@ PORTNAME= recommonmark PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/license.md RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}CommonMark>=0.7.3:textproc/py-CommonMark@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx18>=1.3.1:textproc/py-sphinx18@${PY_FLAVOR} + ${PY_SPHINX} USES= python USE_PYTHON= autoplist concurrent distutils
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005182150.04ILoTDw023375>