| 1 |
commit: 37b6068af97843c4ebf52e6aec8b95f3a723bd78 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 17 10:07:20 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 28 13:15:30 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37b6068a |
| 7 |
|
| 8 |
media-libs/mesa: Use helper var in LLVM deps for flexibility |
| 9 |
|
| 10 |
media-libs/mesa/mesa-9999.ebuild | 21 +++++++++++++-------- |
| 11 |
1 file changed, 13 insertions(+), 8 deletions(-) |
| 12 |
|
| 13 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 14 |
index 667956a123f..6cc00b90712 100644 |
| 15 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 16 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 17 |
@@ -140,58 +140,63 @@ RDEPEND="${RDEPEND} |
| 18 |
# Please keep the LLVM dependency block separate. Since LLVM is slotted, |
| 19 |
# we need to *really* make sure we're not pulling one than more slot |
| 20 |
# simultaneously. |
| 21 |
+LLVM_DEPSTR=">=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}]" |
| 22 |
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} |
| 23 |
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} |
| 24 |
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} |
| 25 |
RDEPEND="${RDEPEND} |
| 26 |
llvm? ( |
| 27 |
opencl? ( |
| 28 |
video_cards_r600? ( |
| 29 |
- >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] |
| 30 |
+ ${CLANG_DEPSTR_AMDGPU} |
| 31 |
) |
| 32 |
!video_cards_r600? ( |
| 33 |
video_cards_radeonsi? ( |
| 34 |
- >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] |
| 35 |
+ ${CLANG_DEPSTR_AMDGPU} |
| 36 |
) |
| 37 |
) |
| 38 |
!video_cards_r600? ( |
| 39 |
!video_cards_radeonsi? ( |
| 40 |
video_cards_radeon? ( |
| 41 |
- >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] |
| 42 |
+ ${CLANG_DEPSTR_AMDGPU} |
| 43 |
) |
| 44 |
) |
| 45 |
) |
| 46 |
!video_cards_r600? ( |
| 47 |
!video_cards_radeon? ( |
| 48 |
!video_cards_radeonsi? ( |
| 49 |
- >=sys-devel/clang-3.9.0:=[${MULTILIB_USEDEP}] |
| 50 |
+ ${CLANG_DEPSTR} |
| 51 |
) |
| 52 |
) |
| 53 |
) |
| 54 |
) |
| 55 |
!opencl? ( |
| 56 |
video_cards_r600? ( |
| 57 |
- >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] |
| 58 |
+ ${LLVM_DEPSTR_AMDGPU} |
| 59 |
) |
| 60 |
!video_cards_r600? ( |
| 61 |
video_cards_radeonsi? ( |
| 62 |
- >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] |
| 63 |
+ ${LLVM_DEPSTR_AMDGPU} |
| 64 |
) |
| 65 |
) |
| 66 |
!video_cards_r600? ( |
| 67 |
!video_cards_radeonsi? ( |
| 68 |
video_cards_radeon? ( |
| 69 |
- >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP},llvm_targets_AMDGPU(-)] |
| 70 |
+ ${LLVM_DEPSTR_AMDGPU} |
| 71 |
) |
| 72 |
) |
| 73 |
) |
| 74 |
!video_cards_r600? ( |
| 75 |
!video_cards_radeon? ( |
| 76 |
!video_cards_radeonsi? ( |
| 77 |
- >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] |
| 78 |
+ ${LLVM_DEPSTR} |
| 79 |
) |
| 80 |
) |
| 81 |
) |
| 82 |
) |
| 83 |
) |
| 84 |
" |
| 85 |
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} |
| 86 |
|
| 87 |
DEPEND="${RDEPEND} |
| 88 |
${PYTHON_DEPS} |
Archives