commit: 0de4bbdea34662d9f4118ac627064f5af37f34b4 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Fri Apr 10 22:22:04 2020 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Fri Apr 10 23:24:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de4bbde
profiles: Update the ICD-loader mask (commit a41cdae97af) One, mask the versions of dev-libs/ocl-icd installing directly into /usr as well. Two, update the explanation to indicate migration of nvidia-drivers and non-trivial upgrade path as current reasons for keeping these masked for now. Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> profiles/package.mask | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index e20e3a85aa6..1530938083e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -43,14 +43,17 @@ dev-tcltk/tcl-mccp >=dev-libs/libressl-3.1.0 # Marek Szuba <mare...@gentoo.org> (2020-04-08) -# Both of these block app-eselect/eselect-opencl in order to prevent +# All of these block app-eselect/eselect-opencl in order to prevent # file collisions in /usr/include/CL and on /usr/lib/libOpenCL.so* . -# However, virtual/opencl-3 as it stands now does not support -# opencl-icd-loader yet and only pulls in dev-libs/ocl-icd - which depends -# on eselect-opencl. -# Will extend the virtual and remove the mask once satisfied with both -# the new ICD loader itself and the sanity of the eselect-free approach -# to OpenCL. +# However, eselect-opencl is still required by x11-drivers/nvidia-drivers +# (even with USE=-uvm, i.e. when it does NOT handle OpenCL) - which by design +# does not appear in virtual/opencl-3. +# Moreover, upgrading to either of the loader ebuilds listed here +# will on systems using FEATURES=collision-protect require prior manual +# clean-up of libOpenCL links created by eselect-opencl so even with the Nvidia +# situation taken care of, we should probably publish an appropriate news item +# before unmasking these. +>=dev-libs/ocl-icd-2.2.12-r3 dev-libs/opencl-icd-loader dev-util/opencl-headers
