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 92BAD1382C5 for ; Sun, 29 Nov 2020 08:59:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C67E9E085E; Sun, 29 Nov 2020 08:59:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 B181DE085E for ; Sun, 29 Nov 2020 08:59:36 +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 E1C143414B9 for ; Sun, 29 Nov 2020 08:59:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD2DC474 for ; Sun, 29 Nov 2020 08:59:32 +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: <1606639929.e2ef809fb26fc3ba1b40677f0a0ff59fc8157c7d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/lld/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/lld/lld-11.0.0.9999.ebuild sys-devel/lld/lld-12.0.0.9999.ebuild X-VCS-Directories: sys-devel/lld/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e2ef809fb26fc3ba1b40677f0a0ff59fc8157c7d X-VCS-Branch: master Date: Sun, 29 Nov 2020 08:59:32 +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: 1a364657-08c3-4bf2-8432-2d89e4416cde X-Archives-Hash: fac286f19b2341236a9762480e08f03d commit: e2ef809fb26fc3ba1b40677f0a0ff59fc8157c7d Author: Michał Górny gentoo org> AuthorDate: Sun Nov 29 08:52:09 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Nov 29 08:52:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2ef809f sys-devel/lld: Delay llvm.org_set_globals after vars Signed-off-by: Michał Górny gentoo.org> sys-devel/lld/lld-11.0.0.9999.ebuild | 10 ++++++---- sys-devel/lld/lld-12.0.0.9999.ebuild | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sys-devel/lld/lld-11.0.0.9999.ebuild b/sys-devel/lld/lld-11.0.0.9999.ebuild index 05be08d3d09..4b86a2bdffe 100644 --- a/sys-devel/lld/lld-11.0.0.9999.ebuild +++ b/sys-devel/lld/lld-11.0.0.9999.ebuild @@ -8,9 +8,6 @@ inherit cmake llvm llvm.org python-any-r1 DESCRIPTION="The LLVM linker (link editor)" HOMEPAGE="https://llvm.org/" -LLVM_COMPONENTS=( lld ) -LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) -llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -20,11 +17,16 @@ RESTRICT="!test? ( test )" RDEPEND="~sys-devel/llvm-${PV}" DEPEND="${RDEPEND}" -BDEPEND="test? ( +BDEPEND=" + test? ( >=dev-util/cmake-3.16 $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" +LLVM_COMPONENTS=( lld ) +LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) +llvm.org_set_globals + python_check_deps() { has_version -b "dev-python/lit[${PYTHON_USEDEP}]" } diff --git a/sys-devel/lld/lld-12.0.0.9999.ebuild b/sys-devel/lld/lld-12.0.0.9999.ebuild index 61159e289d5..3cf868e55cb 100644 --- a/sys-devel/lld/lld-12.0.0.9999.ebuild +++ b/sys-devel/lld/lld-12.0.0.9999.ebuild @@ -8,9 +8,6 @@ inherit cmake llvm llvm.org python-any-r1 DESCRIPTION="The LLVM linker (link editor)" HOMEPAGE="https://llvm.org/" -LLVM_COMPONENTS=( lld libunwind/include/mach-o ) -LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) -llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -20,11 +17,16 @@ RESTRICT="!test? ( test )" RDEPEND="~sys-devel/llvm-${PV}" DEPEND="${RDEPEND}" -BDEPEND="test? ( +BDEPEND=" + test? ( >=dev-util/cmake-3.16 $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" +LLVM_COMPONENTS=( lld libunwind/include/mach-o ) +LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) +llvm.org_set_globals + python_check_deps() { has_version -b "dev-python/lit[${PYTHON_USEDEP}]" }