commit: 4ce5b6e6aaf12e5f136a618a6aa972338381544d Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Nov 29 08:55:58 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Nov 29 08:58:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce5b6e6
sys-libs/compiler-rt-sanitizers: Delay llvm.org_set_globals after vars Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../compiler-rt-sanitizers-11.0.0.9999.ebuild | 10 ++++++---- .../compiler-rt-sanitizers-12.0.0.9999.ebuild | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild index ce473ae200d..1e3a849c675 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild @@ -8,9 +8,6 @@ inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/"; -LLVM_COMPONENTS=( compiler-rt ) -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) -llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" @@ -32,9 +29,14 @@ BDEPEND=" !<sys-apps/sandbox-2.13 $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]") =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} - sys-libs/compiler-rt:${SLOT} ) + sys-libs/compiler-rt:${SLOT} + ) ${PYTHON_DEPS}" +LLVM_COMPONENTS=( compiler-rt ) +LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) +llvm.org_set_globals + python_check_deps() { use test || return 0 has_version "dev-python/lit[${PYTHON_USEDEP}]" diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild index ce473ae200d..1e3a849c675 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild @@ -8,9 +8,6 @@ inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/"; -LLVM_COMPONENTS=( compiler-rt ) -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) -llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" @@ -32,9 +29,14 @@ BDEPEND=" !<sys-apps/sandbox-2.13 $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]") =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} - sys-libs/compiler-rt:${SLOT} ) + sys-libs/compiler-rt:${SLOT} + ) ${PYTHON_DEPS}" +LLVM_COMPONENTS=( compiler-rt ) +LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) +llvm.org_set_globals + python_check_deps() { use test || return 0 has_version "dev-python/lit[${PYTHON_USEDEP}]"
