git: 7cea690fddbd - main - devel.llvm[12345678]: remove cmark conflict [NFC]
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Oct 2024 23:16:59 UTC
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=7cea690fddbd4f6bb3ad3360e625754bde7ac4e6 commit 7cea690fddbd4f6bb3ad3360e625754bde7ac4e6 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2024-10-01 23:15:29 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2024-10-01 23:16:46 +0000 devel.llvm[12345678]: remove cmark conflict [NFC] The build conflict with cmark is no longer needed. PR: 239636, 274848 --- devel/llvm11/Makefile | 1 - devel/llvm12/Makefile | 1 - devel/llvm13/Makefile | 1 - devel/llvm14/Makefile | 1 - devel/llvm15/Makefile | 1 - devel/llvm16/Makefile | 1 - devel/llvm17/Makefile | 1 - devel/llvm18/Makefile | 1 - 8 files changed, 8 deletions(-) diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index 5a2587e4d02f..76071eec226a 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -105,7 +105,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index 73d1f2e86b2d..2b9ed5eb4cc5 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -115,7 +115,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index 414a74af375d..00a6c0dd61e1 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -129,7 +129,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index f59acfb1106d..b8e9bcf4471b 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -135,7 +135,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile index b75f500f4fc8..f487da536760 100644 --- a/devel/llvm15/Makefile +++ b/devel/llvm15/Makefile @@ -153,7 +153,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_IGNORELISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index d04686f98467..3b4405abf143 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -153,7 +153,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS} DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile index cd5e9de25489..818ac251a82a 100644 --- a/devel/llvm17/Makefile +++ b/devel/llvm17/Makefile @@ -157,7 +157,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS} DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile index b0e8b0e2a820..2ff7b4aa3c01 100644 --- a/devel/llvm18/Makefile +++ b/devel/llvm18/Makefile @@ -155,7 +155,6 @@ DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}myst-parser>0:textproc/py-myst-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \