commit: 38bca441a665b8aeeaaf51e8fdffe84c4067f0e2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Nov 29 08:55:36 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=38bca441
sys-libs/compiler-rt: Delay llvm.org_set_globals after vars Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild | 8 +++++--- sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild index f913057ff61..38a2cbc81fb 100644 --- a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild @@ -8,8 +8,6 @@ inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/"; -LLVM_COMPONENTS=( compiler-rt ) -llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" @@ -26,9 +24,13 @@ BDEPEND=" clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + ) ${PYTHON_DEPS}" +LLVM_COMPONENTS=( compiler-rt ) +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/compiler-rt-12.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild index f913057ff61..38a2cbc81fb 100644 --- a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild @@ -8,8 +8,6 @@ inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/"; -LLVM_COMPONENTS=( compiler-rt ) -llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" @@ -26,9 +24,13 @@ BDEPEND=" clang? ( sys-devel/clang ) test? ( $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + ) ${PYTHON_DEPS}" +LLVM_COMPONENTS=( compiler-rt ) +llvm.org_set_globals + python_check_deps() { use test || return 0 has_version "dev-python/lit[${PYTHON_USEDEP}]"
