| 1 |
commit: 72d73763a50ce8e6fcc54f7ebd84feeb7d09fee5 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 4 18:47:03 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 4 19:01:20 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72d73763 |
| 7 |
|
| 8 |
sys-libs/compiler-rt: Try to workaround Portage bug 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/compiler-rt-13.0.0.ebuild | 4 +++- |
| 18 |
sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild | 4 +++- |
| 19 |
sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild | 4 +++- |
| 20 |
sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild | 4 +++- |
| 21 |
4 files changed, 12 insertions(+), 4 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild |
| 24 |
index 564c29b11eaa..a2d62590de11 100644 |
| 25 |
--- a/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild |
| 26 |
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild |
| 27 |
@@ -26,7 +26,9 @@ BDEPEND=" |
| 28 |
$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") |
| 29 |
=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} |
| 30 |
) |
| 31 |
- ${PYTHON_DEPS}" |
| 32 |
+ !test? ( |
| 33 |
+ ${PYTHON_DEPS} |
| 34 |
+ )" |
| 35 |
|
| 36 |
LLVM_COMPONENTS=( compiler-rt ) |
| 37 |
LLVM_PATCHSET=${PV/_/-} |
| 38 |
|
| 39 |
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild |
| 40 |
index 0a82b041cbde..1f0bd3af8c06 100644 |
| 41 |
--- a/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild |
| 42 |
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild |
| 43 |
@@ -26,7 +26,9 @@ BDEPEND=" |
| 44 |
$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") |
| 45 |
=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} |
| 46 |
) |
| 47 |
- ${PYTHON_DEPS}" |
| 48 |
+ !test? ( |
| 49 |
+ ${PYTHON_DEPS} |
| 50 |
+ )" |
| 51 |
|
| 52 |
LLVM_COMPONENTS=( compiler-rt ) |
| 53 |
LLVM_PATCHSET=9999-1 |
| 54 |
|
| 55 |
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild |
| 56 |
index 3c0553bcebbd..b2851d32c00e 100644 |
| 57 |
--- a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild |
| 58 |
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild |
| 59 |
@@ -26,7 +26,9 @@ BDEPEND=" |
| 60 |
$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") |
| 61 |
=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} |
| 62 |
) |
| 63 |
- ${PYTHON_DEPS}" |
| 64 |
+ !test? ( |
| 65 |
+ ${PYTHON_DEPS} |
| 66 |
+ )" |
| 67 |
|
| 68 |
LLVM_COMPONENTS=( compiler-rt ) |
| 69 |
LLVM_PATCHSET=${PV/_/-} |
| 70 |
|
| 71 |
diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild |
| 72 |
index 3d2048549e73..98c8fe855cfe 100644 |
| 73 |
--- a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild |
| 74 |
+++ b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild |
| 75 |
@@ -26,7 +26,9 @@ BDEPEND=" |
| 76 |
$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") |
| 77 |
=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} |
| 78 |
) |
| 79 |
- ${PYTHON_DEPS}" |
| 80 |
+ !test? ( |
| 81 |
+ ${PYTHON_DEPS} |
| 82 |
+ )" |
| 83 |
|
| 84 |
LLVM_COMPONENTS=( compiler-rt cmake ) |
| 85 |
LLVM_PATCHSET=9999-1 |
Archives