1 |
commit: 285426ee4a05c7a3c2a5159bdb73f76c3f6fbec1 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 17 08:51:39 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 28 13:15:04 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285426ee |
7 |
|
8 |
media-libs/mesa: Split LLVM RDEP into sep block |
9 |
|
10 |
Split the LLVM RDEPEND into a separate block for improved readability |
11 |
when I start hacking on it. |
12 |
|
13 |
media-libs/mesa/mesa-9999.ebuild | 14 ++++++++++++-- |
14 |
1 file changed, 12 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
17 |
index 4a8ab358f93..d9a7ac09fcc 100644 |
18 |
--- a/media-libs/mesa/mesa-9999.ebuild |
19 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
20 |
@@ -97,7 +97,6 @@ RDEPEND=" |
21 |
llvm? ( |
22 |
video_cards_radeonsi? ( |
23 |
virtual/libelf:0=[${MULTILIB_USEDEP}] |
24 |
- vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) |
25 |
) |
26 |
video_cards_r600? ( |
27 |
virtual/libelf:0=[${MULTILIB_USEDEP}] |
28 |
@@ -105,7 +104,6 @@ RDEPEND=" |
29 |
video_cards_radeon? ( |
30 |
virtual/libelf:0=[${MULTILIB_USEDEP}] |
31 |
) |
32 |
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] |
33 |
) |
34 |
opencl? ( |
35 |
app-eselect/eselect-opencl |
36 |
@@ -139,6 +137,18 @@ RDEPEND="${RDEPEND} |
37 |
video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) |
38 |
" |
39 |
|
40 |
+# Please keep the LLVM dependency block separate. Since LLVM is slotted, |
41 |
+# we need to *really* make sure we're not pulling one than more slot |
42 |
+# simultaneously. |
43 |
+RDEPEND="${RDEPEND} |
44 |
+ llvm? ( |
45 |
+ video_cards_radeonsi? ( |
46 |
+ vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) |
47 |
+ ) |
48 |
+ >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] |
49 |
+ ) |
50 |
+" |
51 |
+ |
52 |
# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once |
53 |
# LLVM < 3.9 is out of the game |
54 |
DEPEND="${RDEPEND} |