From 4ce5b6e6aaf12e5f136a618a6aa972338381544d Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 29 Nov 2020 09:55:58 +0100 Subject: sys-libs/compiler-rt-sanitizers: Delay llvm.org_set_globals after vars MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../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(-) (limited to 'sys-libs/compiler-rt-sanitizers') 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 ce473ae200d6..1e3a849c675a 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=" !=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 ce473ae200d6..1e3a849c675a 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=" !=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}]" -- cgit v1.2.3-65-gdbad