summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2020-04-09 22:10:31 +0100
committerMarek Szuba <marecki@gentoo.org>2020-04-09 22:15:22 +0100
commit1831b216b57f9cf9678a328c1d13d9ac3e5cbd6e (patch)
treeee736d4e0efc4d7f97bf4c98dcee76b99ab4c4a6
parentdev-libs/opencl-icd-loader: block dev-libs/ocl-icd (diff)
downloadgentoo-1831b216b57f9cf9678a328c1d13d9ac3e5cbd6e.tar.gz
gentoo-1831b216b57f9cf9678a328c1d13d9ac3e5cbd6e.tar.bz2
gentoo-1831b216b57f9cf9678a328c1d13d9ac3e5cbd6e.zip
dev-libs/ocl-icd: block dev-libs/opencl-icd-loader
Now, because we depend on app-eselect/eselect-opencl and opencl-icd-loader blocks it. In the future, to avoid file collisions on $libdir/libOpenCL.so* Committed directly due to prolonged absence of the maintainer. Signed-off-by: Marek Szuba <marecki@gentoo.org>
-rw-r--r--dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild (renamed from dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild)3
1 files changed, 2 insertions, 1 deletions
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild
index 3142ef64c659..192d49e15487 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
IUSE="+khronos-headers"
BDEPEND="${RUBY_DEPS}"
-RDEPEND="app-eselect/eselect-opencl"
+RDEPEND="app-eselect/eselect-opencl
+ !dev-libs/opencl-icd-loader"
PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)