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