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 7CB64138350 for ; Fri, 10 Apr 2020 13:32:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9B24E09E9; Fri, 10 Apr 2020 13:32:01 +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 89672E09E9 for ; Fri, 10 Apr 2020 13:32:01 +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 4EA6D34EF98 for ; Fri, 10 Apr 2020 13:32:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0E3071 for ; Fri, 10 Apr 2020 13:31:57 +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: <1586524521.5896f661feb5a387d4d25c79c98ea1779cf56346.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: virtual/opencl/ X-VCS-Repository: repo/gentoo X-VCS-Files: virtual/opencl/opencl-3.ebuild X-VCS-Directories: virtual/opencl/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 5896f661feb5a387d4d25c79c98ea1779cf56346 X-VCS-Branch: master Date: Fri, 10 Apr 2020 13:31:57 +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: 9ada0656-5644-487c-b655-14260cc88ee1 X-Archives-Hash: 2b5fa5d67b137d8b6b498ed56869be58 commit: 5896f661feb5a387d4d25c79c98ea1779cf56346 Author: Marek Szuba gentoo org> AuthorDate: Fri Apr 10 13:15:21 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Fri Apr 10 13:15:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5896f661 virtual/opencl: add dev-libs/opencl-icd-loader as alternative provider Works perfectly well, with one caveat - /usr/lib*/libOpenCL.so* symlinks created by eselect-opencl are not actually owned by that package so switching from ocl-icd to opencl-icd-loader will result in file collisions unless said symlinks are manually removed in advance. Signed-off-by: Marek Szuba gentoo.org> virtual/opencl/opencl-3.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/virtual/opencl/opencl-3.ebuild b/virtual/opencl/opencl-3.ebuild index 6268723a166..baa33caadb7 100644 --- a/virtual/opencl/opencl-3.ebuild +++ b/virtual/opencl/opencl-3.ebuild @@ -9,9 +9,8 @@ DESCRIPTION="Virtual for OpenCL API" SLOT="0" KEYWORDS="~amd64 ~x86" -# Will add dev-libs/opencl-icd-loader here as an alternative once all potential -# file collisions with eselect-opencl have been resolved -RDEPEND="dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]" +RDEPEND="|| ( dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}] + dev-libs/opencl-icd-loader[${MULTILIB_USEDEP}] )" # so that src_install() doesn't fail on missing directory S="${WORKDIR}"