| 1 |
commit: 331b7427e495112d3047c30eaa69c9a1bf85cf84 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 4 19:00:04 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 4 19:01:21 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=331b7427 |
| 7 |
|
| 8 |
sys-libs/compiler-rt-sanitizers: Try to stop pulling py3.10 |
| 9 |
|
| 10 |
Portage has a bug where repeated Python any-of (||) dependencies cause |
| 11 |
it to wrongly pull Python 3.10 instead of being happy with the installed |
| 12 |
interpreter. Put the non-test? Python dependency into "!test?" block |
| 13 |
to work around that. |
| 14 |
|
| 15 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 16 |
|
| 17 |
sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild | 4 +++- |
| 18 |
.../compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild | 4 +++- |
| 19 |
.../compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild | 4 +++- |
| 20 |
.../compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild | 4 +++- |
| 21 |
4 files changed, 12 insertions(+), 4 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild |
| 24 |
index 13512435fcd3..68f7e7b395dd 100644 |
| 25 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild |
| 26 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild |
| 27 |
@@ -45,7 +45,9 @@ BDEPEND=" |
| 28 |
=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} |
| 29 |
sys-libs/compiler-rt:${SLOT} |
| 30 |
) |
| 31 |
- ${PYTHON_DEPS}" |
| 32 |
+ !test? ( |
| 33 |
+ ${PYTHON_DEPS} |
| 34 |
+ )" |
| 35 |
|
| 36 |
LLVM_COMPONENTS=( compiler-rt ) |
| 37 |
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
| 38 |
|
| 39 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild |
| 40 |
index 166db1d476f2..f89af63c6d33 100644 |
| 41 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild |
| 42 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild |
| 43 |
@@ -45,7 +45,9 @@ BDEPEND=" |
| 44 |
=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} |
| 45 |
sys-libs/compiler-rt:${SLOT} |
| 46 |
) |
| 47 |
- ${PYTHON_DEPS}" |
| 48 |
+ !test? ( |
| 49 |
+ ${PYTHON_DEPS} |
| 50 |
+ )" |
| 51 |
|
| 52 |
LLVM_COMPONENTS=( compiler-rt ) |
| 53 |
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
| 54 |
|
| 55 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild |
| 56 |
index 584e656370cc..c456d296bcb8 100644 |
| 57 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild |
| 58 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild |
| 59 |
@@ -45,7 +45,9 @@ BDEPEND=" |
| 60 |
=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} |
| 61 |
sys-libs/compiler-rt:${SLOT} |
| 62 |
) |
| 63 |
- ${PYTHON_DEPS}" |
| 64 |
+ !test? ( |
| 65 |
+ ${PYTHON_DEPS} |
| 66 |
+ )" |
| 67 |
|
| 68 |
LLVM_COMPONENTS=( compiler-rt ) |
| 69 |
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
| 70 |
|
| 71 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild |
| 72 |
index 300f5b58df57..4e70cfd227c4 100644 |
| 73 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild |
| 74 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild |
| 75 |
@@ -45,7 +45,9 @@ BDEPEND=" |
| 76 |
=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} |
| 77 |
sys-libs/compiler-rt:${SLOT} |
| 78 |
) |
| 79 |
- ${PYTHON_DEPS}" |
| 80 |
+ !test? ( |
| 81 |
+ ${PYTHON_DEPS} |
| 82 |
+ )" |
| 83 |
|
| 84 |
LLVM_COMPONENTS=( compiler-rt cmake ) |
| 85 |
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
Archives