From: Marek Szuba <marecki@gentoo.org>
Date: Wed, 8 Apr 2020 22:29:06 +0000 (+0100)
Subject: dev-libs/opencl-icd-loader: install directly into /usr/$(get_libdir)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a575f9498cb5e6e8520c5cd801211e6d0dfccd09;p=gentoo.git

dev-libs/opencl-icd-loader: install directly into /usr/$(get_libdir)

To facilitate transition testing to eselect-free, loader-based OpenCL
support without breaking the more established ICD loader i.e. ocl-icd.
Moreover, it was mostly useless in /usr/lib/OpenCL/vendor/... due to
eselect-opencl not handling unified headers correctly.

Note that this WILL cause massive dependency issues until the package
in question has been added to virtual/opencl. Use with caution.

Signed-off-by: Marek Szuba <marecki@gentoo.org>
---

diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
similarity index 73%
rename from dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13.ebuild
rename to dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
index 617e29a65dd2..82bb5e6b4d8a 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
@@ -20,9 +20,9 @@ IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-DEPEND="dev-util/opencl-headers"
-RDEPEND="${DEPEND}
-	app-eselect/eselect-opencl"
+DEPEND="dev-util/opencl-headers
+	!app-eselect/eselect-opencl"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -36,13 +36,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local ocl_dir="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${ocl_dir}"
-		-DCMAKE_INSTALL_LIBDIR="${ocl_dir}"
 		-DBUILD_TESTING=$(usex test)
-		-DOPENCL_ICD_LOADER_HEADERS_DIR="${ocl_dir}/include"
+		-DOPENCL_ICD_LOADER_HEADERS_DIR="${EPREFIX}/usr/include"
 	)
 	cmake_src_configure
 }
@@ -51,7 +47,3 @@ multilib_src_test() {
 	OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" \
 	cmake_src_test
 }
-
-pkg_postinst() {
-	eselect opencl set --use-old "${PN}"
-}