commit: e2ef809fb26fc3ba1b40677f0a0ff59fc8157c7d Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Nov 29 08:52:09 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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}]" }
