| 1 |
commit: 38bca441a665b8aeeaaf51e8fdffe84c4067f0e2 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 29 08:55:36 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 29 08:58:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38bca441 |
| 7 |
|
| 8 |
sys-libs/compiler-rt: Delay llvm.org_set_globals after vars |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild | 8 +++++--- |
| 13 |
sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild | 8 +++++--- |
| 14 |
2 files changed, 10 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
index f913057ff61..38a2cbc81fb 100644 |
| 18 |
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild |
| 19 |
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild |
| 20 |
@@ -8,8 +8,6 @@ inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs |
| 21 |
|
| 22 |
DESCRIPTION="Compiler runtime library for clang (built-in part)" |
| 23 |
HOMEPAGE="https://llvm.org/" |
| 24 |
-LLVM_COMPONENTS=( compiler-rt ) |
| 25 |
-llvm.org_set_globals |
| 26 |
|
| 27 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 28 |
SLOT="$(ver_cut 1-3)" |
| 29 |
@@ -26,9 +24,13 @@ BDEPEND=" |
| 30 |
clang? ( sys-devel/clang ) |
| 31 |
test? ( |
| 32 |
$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") |
| 33 |
- =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) |
| 34 |
+ =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} |
| 35 |
+ ) |
| 36 |
${PYTHON_DEPS}" |
| 37 |
|
| 38 |
+LLVM_COMPONENTS=( compiler-rt ) |
| 39 |
+llvm.org_set_globals |
| 40 |
+ |
| 41 |
python_check_deps() { |
| 42 |
use test || return 0 |
| 43 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 44 |
|
| 45 |
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 |
| 46 |
index f913057ff61..38a2cbc81fb 100644 |
| 47 |
--- a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild |
| 48 |
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild |
| 49 |
@@ -8,8 +8,6 @@ inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs |
| 50 |
|
| 51 |
DESCRIPTION="Compiler runtime library for clang (built-in part)" |
| 52 |
HOMEPAGE="https://llvm.org/" |
| 53 |
-LLVM_COMPONENTS=( compiler-rt ) |
| 54 |
-llvm.org_set_globals |
| 55 |
|
| 56 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 57 |
SLOT="$(ver_cut 1-3)" |
| 58 |
@@ -26,9 +24,13 @@ BDEPEND=" |
| 59 |
clang? ( sys-devel/clang ) |
| 60 |
test? ( |
| 61 |
$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") |
| 62 |
- =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) |
| 63 |
+ =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} |
| 64 |
+ ) |
| 65 |
${PYTHON_DEPS}" |
| 66 |
|
| 67 |
+LLVM_COMPONENTS=( compiler-rt ) |
| 68 |
+llvm.org_set_globals |
| 69 |
+ |
| 70 |
python_check_deps() { |
| 71 |
use test || return 0 |
| 72 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
Archives