From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E40281382C5 for ; Sat, 20 Jun 2020 10:21:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 228F3E0891; Sat, 20 Jun 2020 10:21:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1EB9E0891 for ; Sat, 20 Jun 2020 10:21:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E91F534F398 for ; Sat, 20 Jun 2020 10:21:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54BEA2A1 for ; Sat, 20 Jun 2020 10:21:13 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1592648469.02a95346c8ec464b36b36db8f04453f17dd51cfa.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/llvm/llvm-10.0.1.9999.ebuild sys-devel/llvm/llvm-10.0.1_rc1.ebuild sys-devel/llvm/llvm-11.0.0.9999.ebuild X-VCS-Directories: sys-devel/llvm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 02a95346c8ec464b36b36db8f04453f17dd51cfa X-VCS-Branch: master Date: Sat, 20 Jun 2020 10:21:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f5625604-0649-4931-abf3-81871d9cd81c X-Archives-Hash: f70b92b1bb8118d054e49b931d06d04f commit: 02a95346c8ec464b36b36db8f04453f17dd51cfa Author: Michał Górny gentoo org> AuthorDate: Sat Jun 20 09:11:52 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jun 20 10:21:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a95346 sys-devel/llvm: Always build manpages from source Signed-off-by: Michał Górny gentoo.org> sys-devel/llvm/llvm-10.0.1.9999.ebuild | 36 +++++++++++++++++++++------------- sys-devel/llvm/llvm-10.0.1_rc1.ebuild | 36 +++++++++++++++++++++------------- sys-devel/llvm/llvm-11.0.0.9999.ebuild | 36 +++++++++++++++++++++------------- 3 files changed, 66 insertions(+), 42 deletions(-) diff --git a/sys-devel/llvm/llvm-10.0.1.9999.ebuild b/sys-devel/llvm/llvm-10.0.1.9999.ebuild index ccddd737630..15591957825 100644 --- a/sys-devel/llvm/llvm-10.0.1.9999.ebuild +++ b/sys-devel/llvm/llvm-10.0.1.9999.ebuild @@ -58,12 +58,11 @@ BDEPEND=" =sys-devel/binutils-apple-5.1 ) - doc? ( $(python_gen_any_dep ' - dev-python/recommonmark[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') ) libffi? ( virtual/pkgconfig ) - ${PYTHON_DEPS}" + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] ) + ')" # There are no file collisions between these versions but having :0 # installed means llvm-config there will take precedence. RDEPEND="${RDEPEND} @@ -75,9 +74,10 @@ PDEPEND="sys-devel/llvm-common CMAKE_BUILD_TYPE=RelWithDebInfo python_check_deps() { - use doc || return 0 - - has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && + if use doc; then + has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" || + return 1 + fi has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } @@ -138,6 +138,10 @@ check_distribution_components() { distribution|llvm-libraries) continue ;; + # used only w/ USE=doc + docs-llvm-html) + continue + ;; esac all_targets+=( "${l}" ) @@ -184,6 +188,11 @@ src_prepare() { # Update config.guess to support more systems cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die + # manpages don't use markdown + if ! use doc; then + sed -i -e '/source_parsers/d' docs/conf.py || die + fi + # User patches + QA cmake-utils_src_prepare @@ -303,12 +312,13 @@ get_distribution_components() { # python modules opt-viewer - ) - use doc && out+=( + # manpages docs-dsymutil-man docs-llvm-dwarfdump-man docs-llvm-man + ) + use doc && out+=( docs-llvm-html ) @@ -390,13 +400,11 @@ multilib_src_configure() { if multilib_is_native_abi; then mycmakeargs+=( - -DLLVM_BUILD_DOCS=$(usex doc) + -DLLVM_BUILD_DOCS=ON -DLLVM_ENABLE_OCAMLDOC=OFF - -DLLVM_ENABLE_SPHINX=$(usex doc) + -DLLVM_ENABLE_SPHINX=ON -DLLVM_ENABLE_DOXYGEN=OFF -DLLVM_INSTALL_UTILS=ON - ) - use doc && mycmakeargs+=( -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" -DSPHINX_WARNINGS_AS_ERRORS=OFF diff --git a/sys-devel/llvm/llvm-10.0.1_rc1.ebuild b/sys-devel/llvm/llvm-10.0.1_rc1.ebuild index 69e7f467ecd..d60b458d6a0 100644 --- a/sys-devel/llvm/llvm-10.0.1_rc1.ebuild +++ b/sys-devel/llvm/llvm-10.0.1_rc1.ebuild @@ -58,12 +58,11 @@ BDEPEND=" =sys-devel/binutils-apple-5.1 ) - doc? ( $(python_gen_any_dep ' - dev-python/recommonmark[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') ) libffi? ( virtual/pkgconfig ) - ${PYTHON_DEPS}" + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] ) + ')" # There are no file collisions between these versions but having :0 # installed means llvm-config there will take precedence. RDEPEND="${RDEPEND} @@ -75,9 +74,10 @@ PDEPEND="sys-devel/llvm-common CMAKE_BUILD_TYPE=RelWithDebInfo python_check_deps() { - use doc || return 0 - - has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && + if use doc; then + has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" || + return 1 + fi has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } @@ -106,6 +106,10 @@ check_distribution_components() { distribution|llvm-libraries) continue ;; + # used only w/ USE=doc + docs-llvm-html) + continue + ;; esac all_targets+=( "${l}" ) @@ -152,6 +156,11 @@ src_prepare() { # Update config.guess to support more systems cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die + # manpages don't use markdown + if ! use doc; then + sed -i -e '/source_parsers/d' docs/conf.py || die + fi + # User patches + QA cmake-utils_src_prepare } @@ -268,12 +277,13 @@ get_distribution_components() { # python modules opt-viewer - ) - use doc && out+=( + # manpages docs-dsymutil-man docs-llvm-dwarfdump-man docs-llvm-man + ) + use doc && out+=( docs-llvm-html ) @@ -355,13 +365,11 @@ multilib_src_configure() { if multilib_is_native_abi; then mycmakeargs+=( - -DLLVM_BUILD_DOCS=$(usex doc) + -DLLVM_BUILD_DOCS=ON -DLLVM_ENABLE_OCAMLDOC=OFF - -DLLVM_ENABLE_SPHINX=$(usex doc) + -DLLVM_ENABLE_SPHINX=ON -DLLVM_ENABLE_DOXYGEN=OFF -DLLVM_INSTALL_UTILS=ON - ) - use doc && mycmakeargs+=( -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" -DSPHINX_WARNINGS_AS_ERRORS=OFF diff --git a/sys-devel/llvm/llvm-11.0.0.9999.ebuild b/sys-devel/llvm/llvm-11.0.0.9999.ebuild index f6ed4b7a9be..bcf802e8847 100644 --- a/sys-devel/llvm/llvm-11.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-11.0.0.9999.ebuild @@ -58,12 +58,11 @@ BDEPEND=" =sys-devel/binutils-apple-5.1 ) - doc? ( $(python_gen_any_dep ' - dev-python/recommonmark[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') ) libffi? ( virtual/pkgconfig ) - ${PYTHON_DEPS}" + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] ) + ')" # There are no file collisions between these versions but having :0 # installed means llvm-config there will take precedence. RDEPEND="${RDEPEND} @@ -75,9 +74,10 @@ PDEPEND="sys-devel/llvm-common CMAKE_BUILD_TYPE=RelWithDebInfo python_check_deps() { - use doc || return 0 - - has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && + if use doc; then + has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" || + return 1 + fi has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } @@ -138,6 +138,10 @@ check_distribution_components() { distribution|llvm-libraries) continue ;; + # used only w/ USE=doc + docs-llvm-html) + continue + ;; esac all_targets+=( "${l}" ) @@ -180,6 +184,11 @@ src_prepare() { # Update config.guess to support more systems cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die + # manpages don't use markdown + if ! use doc; then + sed -i -e '/source_parsers/d' docs/conf.py || die + fi + # User patches + QA cmake-utils_src_prepare @@ -301,12 +310,13 @@ get_distribution_components() { # python modules opt-viewer - ) - use doc && out+=( + # manpages docs-dsymutil-man docs-llvm-dwarfdump-man docs-llvm-man + ) + use doc && out+=( docs-llvm-html ) @@ -388,13 +398,11 @@ multilib_src_configure() { if multilib_is_native_abi; then mycmakeargs+=( - -DLLVM_BUILD_DOCS=$(usex doc) + -DLLVM_BUILD_DOCS=ON -DLLVM_ENABLE_OCAMLDOC=OFF - -DLLVM_ENABLE_SPHINX=$(usex doc) + -DLLVM_ENABLE_SPHINX=ON -DLLVM_ENABLE_DOXYGEN=OFF -DLLVM_INSTALL_UTILS=ON - ) - use doc && mycmakeargs+=( -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" -DSPHINX_WARNINGS_AS_ERRORS=OFF