| 1 |
commit: f852c290ad649e8a299e285dae1d51fb55ded064 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 17 09:34:08 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 28 13:15:21 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f852c290 |
| 7 |
|
| 8 |
media-libs/mesa: Fix LLVM dep to pull exactly one version |
| 9 |
|
| 10 |
Since LLVM is slotted, you can't expect multiple different |
| 11 |
dependencies to apply to the same slot. For this reason, we need to |
| 12 |
ensure that only one form of dependency (set of USE flags) is applied to |
| 13 |
LLVM. |
| 14 |
|
| 15 |
To cover all the necessary variants: |
| 16 |
|
| 17 |
- when using [opencl], enforce LLVM version and USE flags through |
| 18 |
implicit dependency via sys-devel/clang; |
| 19 |
|
| 20 |
- enforce [llvm_targets_AMDGPU] for all variants needing it, |
| 21 |
and the non-AMDGPU version only if neither of them applies. |
| 22 |
|
| 23 |
media-libs/mesa/mesa-9999.ebuild | 55 ++++++++++++++++++++++++++++++++-------- |
| 24 |
1 file changed, 45 insertions(+), 10 deletions(-) |
| 25 |
|
| 26 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 27 |
index 0a378a1ffeb..61bcd2822db 100644 |
| 28 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 29 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 30 |
@@ -143,18 +143,53 @@ RDEPEND="${RDEPEND} |
| 31 |
RDEPEND="${RDEPEND} |
| 32 |
llvm? ( |
| 33 |
opencl? ( |
| 34 |
- >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP}] |
| 35 |
- ) |
| 36 |
- video_cards_r600? ( |
| 37 |
- >=sys-devel/llvm-3.9.0[llvm_targets_AMDGPU(-)] |
| 38 |
- ) |
| 39 |
- video_cards_radeon? ( |
| 40 |
- >=sys-devel/llvm-3.9.0[llvm_targets_AMDGPU(-)] |
| 41 |
+ video_cards_r600? ( |
| 42 |
+ >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] |
| 43 |
+ ) |
| 44 |
+ !video_cards_r600? ( |
| 45 |
+ video_cards_radeonsi? ( |
| 46 |
+ >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] |
| 47 |
+ ) |
| 48 |
+ ) |
| 49 |
+ !video_cards_r600? ( |
| 50 |
+ !video_cards_radeonsi? ( |
| 51 |
+ video_cards_radeon? ( |
| 52 |
+ >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] |
| 53 |
+ ) |
| 54 |
+ ) |
| 55 |
+ ) |
| 56 |
+ !video_cards_r600? ( |
| 57 |
+ !video_cards_radeon? ( |
| 58 |
+ !video_cards_radeonsi? ( |
| 59 |
+ >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP}] |
| 60 |
+ ) |
| 61 |
+ ) |
| 62 |
+ ) |
| 63 |
) |
| 64 |
- video_cards_radeonsi? ( |
| 65 |
- >=sys-devel/llvm-3.9.0[llvm_targets_AMDGPU(-)] |
| 66 |
+ !opencl? ( |
| 67 |
+ video_cards_r600? ( |
| 68 |
+ >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] |
| 69 |
+ ) |
| 70 |
+ !video_cards_r600? ( |
| 71 |
+ video_cards_radeonsi? ( |
| 72 |
+ >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] |
| 73 |
+ ) |
| 74 |
+ ) |
| 75 |
+ !video_cards_r600? ( |
| 76 |
+ !video_cards_radeonsi? ( |
| 77 |
+ video_cards_radeon? ( |
| 78 |
+ >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] |
| 79 |
+ ) |
| 80 |
+ ) |
| 81 |
+ ) |
| 82 |
+ !video_cards_r600? ( |
| 83 |
+ !video_cards_radeon? ( |
| 84 |
+ !video_cards_radeonsi? ( |
| 85 |
+ >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] |
| 86 |
+ ) |
| 87 |
+ ) |
| 88 |
+ ) |
| 89 |
) |
| 90 |
- >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] |
| 91 |
) |
| 92 |
" |
Archives