| 1 |
commit: 6e97d56ed0340ed41cff2d61e3c2d559db6538c1 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 1 20:57:14 2020 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 1 21:15:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e97d56e |
| 7 |
|
| 8 |
virtual/opencl: fix amdgpu dependencies |
| 9 |
|
| 10 |
1. Not sure if this is due to what upstream supports (like for both |
| 11 |
Intel providers) or because it has not been implemented - but |
| 12 |
either way, as of 2020-04-01 dev-libs/rocm-opencl-runtime neither is |
| 13 |
keyworded x86 nor supports multilib on amd64; |
| 14 |
2. Conversely, dev-libs/amdgpu-pro-opencl does both so in order for |
| 15 |
multilib to work properly it should be passed $MULTILIB_USEDEP. |
| 16 |
|
| 17 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 18 |
|
| 19 |
virtual/opencl/opencl-2.ebuild | 6 +++--- |
| 20 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
diff --git a/virtual/opencl/opencl-2.ebuild b/virtual/opencl/opencl-2.ebuild |
| 23 |
index 50fcd113e31..51ea03746de 100644 |
| 24 |
--- a/virtual/opencl/opencl-2.ebuild |
| 25 |
+++ b/virtual/opencl/opencl-2.ebuild |
| 26 |
@@ -11,7 +11,7 @@ KEYWORDS="amd64 x86" |
| 27 |
CARDS=( amdgpu i965 nvidia r600 radeonsi ) |
| 28 |
IUSE="${CARDS[@]/#/video_cards_}" |
| 29 |
|
| 30 |
-# intel-neo and intel-ocl-sdk are amd64-only |
| 31 |
+# intel-neo, intel-ocl-sdk and rocm-opencl-runtime are abi_x86_64-only |
| 32 |
# ocl-icd is essentially a dummy/you-are-on-your-own provider - it installs |
| 33 |
# header files to include in the source code and a library to link against |
| 34 |
# but does not support any actual devices |
| 35 |
@@ -21,8 +21,8 @@ RDEPEND="app-eselect/eselect-opencl |
| 36 |
abi_x86_64? ( !abi_x86_32? ( dev-libs/intel-neo ) ) |
| 37 |
) |
| 38 |
video_cards_amdgpu? ( || ( |
| 39 |
- dev-libs/rocm-opencl-runtime |
| 40 |
- dev-libs/amdgpu-pro-opencl ) ) |
| 41 |
+ abi_x86_64? ( !abi_x86_32? ( dev-libs/rocm-opencl-runtime ) ) |
| 42 |
+ dev-libs/amdgpu-pro-opencl[${MULTILIB_USEDEP}] ) ) |
| 43 |
video_cards_nvidia? ( || ( |
| 44 |
>=x11-drivers/nvidia-drivers-290.10-r2[uvm(-)] |
| 45 |
>=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}] ) ) |
Archives