From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB3A6138351 for ; Wed, 1 Apr 2020 21:15:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A94DE0D49; Wed, 1 Apr 2020 21:15:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09EC9E0D48 for ; Wed, 1 Apr 2020 21:15:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DA1634F8BD for ; Wed, 1 Apr 2020 21:15:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5B6618F for ; Wed, 1 Apr 2020 21:15:11 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1585775701.6e97d56ed0340ed41cff2d61e3c2d559db6538c1.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: virtual/opencl/ X-VCS-Repository: repo/gentoo X-VCS-Files: virtual/opencl/opencl-2.ebuild X-VCS-Directories: virtual/opencl/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 6e97d56ed0340ed41cff2d61e3c2d559db6538c1 X-VCS-Branch: master Date: Wed, 1 Apr 2020 21:15:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bf26394b-21b5-47da-911e-38fc2883c3a8 X-Archives-Hash: 1ff93ba7973e2e1ab23a4efb0aa9ad53 commit: 6e97d56ed0340ed41cff2d61e3c2d559db6538c1 Author: Marek Szuba gentoo org> AuthorDate: Wed Apr 1 20:57:14 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Wed Apr 1 21:15:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e97d56e virtual/opencl: fix amdgpu dependencies 1. Not sure if this is due to what upstream supports (like for both Intel providers) or because it has not been implemented - but either way, as of 2020-04-01 dev-libs/rocm-opencl-runtime neither is keyworded x86 nor supports multilib on amd64; 2. Conversely, dev-libs/amdgpu-pro-opencl does both so in order for multilib to work properly it should be passed $MULTILIB_USEDEP. Signed-off-by: Marek Szuba gentoo.org> virtual/opencl/opencl-2.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/virtual/opencl/opencl-2.ebuild b/virtual/opencl/opencl-2.ebuild index 50fcd113e31..51ea03746de 100644 --- a/virtual/opencl/opencl-2.ebuild +++ b/virtual/opencl/opencl-2.ebuild @@ -11,7 +11,7 @@ KEYWORDS="amd64 x86" CARDS=( amdgpu i965 nvidia r600 radeonsi ) IUSE="${CARDS[@]/#/video_cards_}" -# intel-neo and intel-ocl-sdk are amd64-only +# intel-neo, intel-ocl-sdk and rocm-opencl-runtime are abi_x86_64-only # ocl-icd is essentially a dummy/you-are-on-your-own provider - it installs # header files to include in the source code and a library to link against # but does not support any actual devices @@ -21,8 +21,8 @@ RDEPEND="app-eselect/eselect-opencl abi_x86_64? ( !abi_x86_32? ( dev-libs/intel-neo ) ) ) video_cards_amdgpu? ( || ( - dev-libs/rocm-opencl-runtime - dev-libs/amdgpu-pro-opencl ) ) + abi_x86_64? ( !abi_x86_32? ( dev-libs/rocm-opencl-runtime ) ) + dev-libs/amdgpu-pro-opencl[${MULTILIB_USEDEP}] ) ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-290.10-r2[uvm(-)] >=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}] ) )