From nobody Fri Jan 06 00:11:46 2023 X-Original-To: dev-commits-ports-main@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 4Np3fp6wFyz2qt8H; Fri, 6 Jan 2023 00:11:46 +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 4Np3fp6Clgz40ch; Fri, 6 Jan 2023 00:11:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672963906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a9n/rxCM9bGOjzq7Q7zcISv9Z96EBjl/FUb7e03/YgE=; b=QlhredLtaxnK/GTWQ4MmYXo+PpP1Lxgel9Z3aYHAL+X5akTzB88oCoKxfMIjdANoN76IUi m2iM+hOdzWgIH1PyYHj+e03mOenScIHtm/UsWd3IJnzZDrjod9tpdPAqh7dVV/tMh0snKK k0eL4utHH0Wf1PXENoYj9a8PLOK/Y6WbhxRTBMxbuBividc7QOZEmBBQukgnyVPizBOiZY IqR2dinT8GlcS8zR5MTXL2HbwpGNSBUhIBmkfRPQYm+D5viVqjpapfl/zRhVAnasMBiEsW gkeZgW05VwDUnRUs8mDA2vdJHtsQKe8wD3ro7SVsc7llhWQKmmmTxYIPvvUi1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672963906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a9n/rxCM9bGOjzq7Q7zcISv9Z96EBjl/FUb7e03/YgE=; b=Owe0f3IkiN3hgTcruNuUBp1EKY2xF7C1pSNhatlZrRi+d1B2iFAKIiSOMcV7PIv9k5/yJa THuQAh9E8t/hk1fyz9MqFHHyxD/XWmA05aGOhhhgr8j1IINf8C5UlDZqExyqGa4C7g/WLj t6WeP/dNNMCMzvhqg+kXTgMvizRHKmGwBuIH1gDXcelv7b2Zc+9kbtEYgCgy08zf5vTyCG DOQFRuEXY1ncozkPY+ipqwc9NJEColrSWQiogjfoljiBI2tGHkLLLl6ghmzcyz0l/swYn4 DkG8J88g29jewNFRlg8I2OtbHTBRG7zUZJdFYAZlScdrd34ZDrwOeSJ7lAZsqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672963906; a=rsa-sha256; cv=none; b=rrqN/rEW/MNHsuOLs/HpgJ/weczC+pBLF9J3U4O7SEpIfR5SZpTWeldIHTsyTK5DtfWK1M Lakhct43ftsJfQUtSsCoy70RrhScRHX5YJ+vuSpK57ICxpOwP2Ckpj0dXd2eS+c21DH+3u KwTyyRBt6VWbxHMKbsu6FYEJBD8LYRM4oHkzI3EL82b3UtK/TDHShWy8PQGIGSUG0pkgh2 Eby2arvsFNu2jTyZugRUO8URhBbU0cfUsiA70CfY5eYnVkE1xBrrCDudrkOgDHMByzdgJ5 D5JUpODNmwPOC9QWCn7ROEFftWnuB1S9HbtkoyIjk5+PEVCx6AL4lmGImkrzzw== 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 4Np3fp5H1Fz18jb; Fri, 6 Jan 2023 00:11:46 +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 3060Bk2F076323; Fri, 6 Jan 2023 00:11:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3060Bk3C076322; Fri, 6 Jan 2023 00:11:46 GMT (envelope-from git) Date: Fri, 6 Jan 2023 00:11:46 GMT Message-Id: <202301060011.3060Bk3C076322@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 47c2b0aec1c3 - main - devel/llvm*: Fix CONFLICT on cmark List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47c2b0aec1c3e92243d2d3677d4a0268475d6e0c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=47c2b0aec1c3e92243d2d3677d4a0268475d6e0c commit 47c2b0aec1c3e92243d2d3677d4a0268475d6e0c Author: Brooks Davis AuthorDate: 2023-01-06 00:06:02 +0000 Commit: Brooks Davis CommitDate: 2023-01-06 00:11:37 +0000 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 --- devel/llvm10/Makefile | 2 +- devel/llvm11/Makefile | 2 +- devel/llvm12/Makefile | 2 +- devel/llvm13/Makefile | 2 +- devel/llvm14/Makefile | 2 +- devel/llvm15/Makefile | 2 +- devel/llvm80/Makefile | 2 +- devel/llvm90/Makefile | 2 +- 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} \