| 1 |
commit: 5e17597e28426c21f051f449c7855c84a136c469 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 4 12:47:34 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 15 12:47:24 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e17597e |
| 7 |
|
| 8 |
media-libs/mesa: Update deps for slotted LLVM |
| 9 |
|
| 10 |
Support slotted LLVM versions correctly. Allow any version for 9999, |
| 11 |
limit to <5 for 17.0.0_rc2 as current git does not work anymore. |
| 12 |
For the older 13.0.4 branch, just force slot :0 since it does not |
| 13 |
support 4.0 (the oldest slotted version). |
| 14 |
|
| 15 |
media-libs/mesa/mesa-13.0.4.ebuild | 8 ++++---- |
| 16 |
media-libs/mesa/mesa-17.0.0.ebuild | 26 ++++++++++++++++++++------ |
| 17 |
media-libs/mesa/mesa-9999.ebuild | 7 ++++--- |
| 18 |
3 files changed, 28 insertions(+), 13 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-libs/mesa/mesa-13.0.4.ebuild b/media-libs/mesa/mesa-13.0.4.ebuild |
| 21 |
index 9948e24050..84081c5be9 100644 |
| 22 |
--- a/media-libs/mesa/mesa-13.0.4.ebuild |
| 23 |
+++ b/media-libs/mesa/mesa-13.0.4.ebuild |
| 24 |
@@ -99,9 +99,9 @@ RDEPEND=" |
| 25 |
llvm? ( |
| 26 |
video_cards_radeonsi? ( |
| 27 |
virtual/libelf:0=[${MULTILIB_USEDEP}] |
| 28 |
- vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) |
| 29 |
+ vulkan? ( >=sys-devel/llvm-3.9.0:0=[${MULTILIB_USEDEP}] ) |
| 30 |
) |
| 31 |
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] |
| 32 |
+ >=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}] |
| 33 |
) |
| 34 |
nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] ) |
| 35 |
!nettle? ( |
| 36 |
@@ -151,8 +151,8 @@ DEPEND="${RDEPEND} |
| 37 |
) ) |
| 38 |
) |
| 39 |
opencl? ( |
| 40 |
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] |
| 41 |
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}] |
| 42 |
+ >=sys-devel/llvm-3.4.2:0=[${MULTILIB_USEDEP}] |
| 43 |
+ >=sys-devel/clang-3.4.2:0=[${MULTILIB_USEDEP}] |
| 44 |
>=sys-devel/gcc-4.6 |
| 45 |
) |
| 46 |
sys-devel/gettext |
| 47 |
|
| 48 |
diff --git a/media-libs/mesa/mesa-17.0.0.ebuild b/media-libs/mesa/mesa-17.0.0.ebuild |
| 49 |
index 11b03e23a3..b35f0bc5ef 100644 |
| 50 |
--- a/media-libs/mesa/mesa-17.0.0.ebuild |
| 51 |
+++ b/media-libs/mesa/mesa-17.0.0.ebuild |
| 52 |
@@ -13,7 +13,7 @@ fi |
| 53 |
|
| 54 |
PYTHON_COMPAT=( python2_7 ) |
| 55 |
|
| 56 |
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} |
| 57 |
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} |
| 58 |
|
| 59 |
OPENGL_DIR="xorg-x11" |
| 60 |
|
| 61 |
@@ -99,9 +99,16 @@ RDEPEND=" |
| 62 |
llvm? ( |
| 63 |
video_cards_radeonsi? ( |
| 64 |
virtual/libelf:0=[${MULTILIB_USEDEP}] |
| 65 |
- vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) |
| 66 |
+ vulkan? ( |
| 67 |
+ || ( |
| 68 |
+ sys-devel/llvm:4 |
| 69 |
+ >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] ) ) |
| 70 |
) |
| 71 |
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] |
| 72 |
+ || ( |
| 73 |
+ sys-devel/llvm:4 |
| 74 |
+ >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}] |
| 75 |
+ ) |
| 76 |
+ <sys-devel/llvm-5:= |
| 77 |
) |
| 78 |
opencl? ( |
| 79 |
app-eselect/eselect-opencl |
| 80 |
@@ -143,9 +150,15 @@ DEPEND="${RDEPEND} |
| 81 |
) ) |
| 82 |
) |
| 83 |
opencl? ( |
| 84 |
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] |
| 85 |
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}] |
| 86 |
- >=sys-devel/gcc-4.6 |
| 87 |
+ || ( |
| 88 |
+ sys-devel/llvm:4 |
| 89 |
+ >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}] |
| 90 |
+ ) |
| 91 |
+ || ( |
| 92 |
+ sys-devel/clang:4 |
| 93 |
+ >=sys-devel/clang-3.6.0:0[${MULTILIB_USEDEP}] |
| 94 |
+ ) |
| 95 |
+ >=sys-devel/gcc-4.6 |
| 96 |
) |
| 97 |
sys-devel/gettext |
| 98 |
virtual/pkgconfig |
| 99 |
@@ -188,6 +201,7 @@ pkg_setup() { |
| 100 |
ewarn "detected! This can cause problems. For details, see bug 459306." |
| 101 |
fi |
| 102 |
|
| 103 |
+ LLVM_MAX_SLOT=4 llvm_pkg_setup |
| 104 |
python-any-r1_pkg_setup |
| 105 |
} |
| 106 |
|
| 107 |
|
| 108 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 109 |
index 11b03e23a3..fe87f66a7b 100644 |
| 110 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 111 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 112 |
@@ -13,7 +13,7 @@ fi |
| 113 |
|
| 114 |
PYTHON_COMPAT=( python2_7 ) |
| 115 |
|
| 116 |
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} |
| 117 |
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} |
| 118 |
|
| 119 |
OPENGL_DIR="xorg-x11" |
| 120 |
|
| 121 |
@@ -143,8 +143,8 @@ DEPEND="${RDEPEND} |
| 122 |
) ) |
| 123 |
) |
| 124 |
opencl? ( |
| 125 |
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] |
| 126 |
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}] |
| 127 |
+ >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] |
| 128 |
+ >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}] |
| 129 |
>=sys-devel/gcc-4.6 |
| 130 |
) |
| 131 |
sys-devel/gettext |
| 132 |
@@ -188,6 +188,7 @@ pkg_setup() { |
| 133 |
ewarn "detected! This can cause problems. For details, see bug 459306." |
| 134 |
fi |
| 135 |
|
| 136 |
+ llvm_pkg_setup |
| 137 |
python-any-r1_pkg_setup |
| 138 |
} |
Archives