diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2021-12-04 20:00:04 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2021-12-04 20:01:21 +0100 |
| commit | 331b7427e495112d3047c30eaa69c9a1bf85cf84 (patch) | |
| tree | 7de21746aa524ec5503e484b959ebe583a2f591a /sys-libs | |
| parent | sys-libs/compiler-rt: Try to workaround Portage bug pulling py3.10 (diff) | |
| download | gentoo-331b7427e495112d3047c30eaa69c9a1bf85cf84.tar.gz gentoo-331b7427e495112d3047c30eaa69c9a1bf85cf84.tar.bz2 gentoo-331b7427e495112d3047c30eaa69c9a1bf85cf84.zip | |
sys-libs/compiler-rt-sanitizers: Try to stop pulling py3.10
Portage has a bug where repeated Python any-of (||) dependencies cause
it to wrongly pull Python 3.10 instead of being happy with the installed
interpreter. Put the non-test? Python dependency into "!test?" block
to work around that.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-libs')
4 files changed, 12 insertions, 4 deletions
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 index 13512435fcd3..68f7e7b395dd 100644 --- 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 @@ -45,7 +45,9 @@ BDEPEND=" =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) - ${PYTHON_DEPS}" + !test? ( + ${PYTHON_DEPS} + )" LLVM_COMPONENTS=( compiler-rt ) LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) 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 index 166db1d476f2..f89af63c6d33 100644 --- 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 @@ -45,7 +45,9 @@ BDEPEND=" =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) - ${PYTHON_DEPS}" + !test? ( + ${PYTHON_DEPS} + )" LLVM_COMPONENTS=( compiler-rt ) LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) 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 index 584e656370cc..c456d296bcb8 100644 --- 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 @@ -45,7 +45,9 @@ BDEPEND=" =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) - ${PYTHON_DEPS}" + !test? ( + ${PYTHON_DEPS} + )" LLVM_COMPONENTS=( compiler-rt ) LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) 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 index 300f5b58df57..4e70cfd227c4 100644 --- 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 @@ -45,7 +45,9 @@ BDEPEND=" =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) - ${PYTHON_DEPS}" + !test? ( + ${PYTHON_DEPS} + )" LLVM_COMPONENTS=( compiler-rt cmake ) LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |