aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2023-01-06 00:06:02 +0000
committerBrooks Davis <brooks@FreeBSD.org>2023-01-06 00:11:37 +0000
commit47c2b0aec1c3e92243d2d3677d4a0268475d6e0c (patch)
tree585e59af4b91974d858748f8839e2860a3849274
parentabdf96d348b9d60575e7a130691108853f881080 (diff)
downloadports-47c2b0aec1c3e92243d2d3677d4a0268475d6e0c.tar.gz
ports-47c2b0aec1c3e92243d2d3677d4a0268475d6e0c.zip
devel/llvm*: Fix CONFLICT on cmark
If the user has the textproc/cmark package installed, the py*-CommonMark package will fail to install. This in turn leads to build failures down the line when sphinx tries to load commonmark. The result is confusing and potentially wastes a lot of build time so just conflict upfront. The previous code attempted to do this, but I'd listed the conflict incorrectly in 2019. :( PR: 239636 Reported by: Stephen Roznowski <sjrbulk@verizon.net>
-rw-r--r--devel/llvm10/Makefile2
-rw-r--r--devel/llvm11/Makefile2
-rw-r--r--devel/llvm12/Makefile2
-rw-r--r--devel/llvm13/Makefile2
-rw-r--r--devel/llvm14/Makefile2
-rw-r--r--devel/llvm15/Makefile2
-rw-r--r--devel/llvm80/Makefile2
-rw-r--r--devel/llvm90/Makefile2
8 files changed, 8 insertions, 8 deletions
diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile
index 203993cdf017..c5537d2c14c9 100644
--- a/devel/llvm10/Makefile
+++ b/devel/llvm10/Makefile
@@ -118,7 +118,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
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= commonmark-cmark
+DOCS_CONFLICTS_BUILD= cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile
index 64dd4fcd3569..e8653ba9472e 100644
--- a/devel/llvm11/Makefile
+++ b/devel/llvm11/Makefile
@@ -115,7 +115,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
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= commonmark-cmark
+DOCS_CONFLICTS_BUILD= cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile
index ef75660bd2b3..7f824f56f9c4 100644
--- a/devel/llvm12/Makefile
+++ b/devel/llvm12/Makefile
@@ -130,7 +130,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
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= commonmark-cmark
+DOCS_CONFLICTS_BUILD= cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
index 013fc23ffaed..82e82aa8fc42 100644
--- a/devel/llvm13/Makefile
+++ b/devel/llvm13/Makefile
@@ -144,7 +144,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS: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= commonmark-cmark
+DOCS_CONFLICTS_BUILD= cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile
index 467f2fbf9e06..f65880ef6c4e 100644
--- a/devel/llvm14/Makefile
+++ b/devel/llvm14/Makefile
@@ -138,7 +138,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS: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= commonmark-cmark
+DOCS_CONFLICTS_BUILD= cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile
index 3f5c726db458..ce65782187d2 100644
--- a/devel/llvm15/Makefile
+++ b/devel/llvm15/Makefile
@@ -140,7 +140,7 @@ 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= commonmark-cmark
+DOCS_CONFLICTS_BUILD= cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/llvm80/Makefile b/devel/llvm80/Makefile
index b5793195acaf..9e70bedb48cc 100644
--- a/devel/llvm80/Makefile
+++ b/devel/llvm80/Makefile
@@ -95,7 +95,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
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= commonmark-cmark
+DOCS_CONFLICTS_BUILD= cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile
index 3b78be0e0d9b..9d69e0859f5a 100644
--- a/devel/llvm90/Makefile
+++ b/devel/llvm90/Makefile
@@ -103,7 +103,7 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
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= commonmark-cmark
+DOCS_CONFLICTS_BUILD= cmark
DOCS_PORTDOCS= llvm
DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \
-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \