diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2022-09-07 16:38:55 +0100 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2022-09-07 16:42:45 +0100 |
| commit | f8a008ea9f06f55adac6692c648f2de60f386a9c (patch) | |
| tree | 630a1d8b3e2b98757323cf264ba44f471bd7f666 | |
| parent | mail-client/thunderbird-bin: stabilize 102.2.1 for x86 (diff) | |
| download | gentoo-f8a008ea.tar.gz gentoo-f8a008ea.tar.bz2 gentoo-f8a008ea.zip | |
dev-libs/opencl-icd-loader: various tweaks
1. Switch from the legacy approach of locating Khronos OpenCL headers
to CMake package-config files, in line with the 2022.05.18 version
of dev-libs/clhpp
2. No need to have dev-util/opencl-headers in RDEPEND;
3. In src_test(), try to make sure the loader loads ONLY the stub driver.
This may or may not something to do with Bug #836476.
Signed-off-by: Marek Szuba <marecki@gentoo.org>
| -rw-r--r-- | dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18-r1.ebuild (renamed from dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild) | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18-r1.ebuild index 0799e46d6593..082f069a5031 100644 --- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild +++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18-r1.ebuild @@ -19,21 +19,23 @@ IUSE="test" RESTRICT="!test? ( test )" -DEPEND=">=dev-util/opencl-headers-${PV} - !dev-libs/ocl-icd" -RDEPEND="${DEPEND}" +RDEPEND="!dev-libs/ocl-icd" +# Need an opencl-headers ebuild which installs cmake package configs +# TODO: revert to the usual >=${PV} come next upstream version +DEPEND="${RDEPEND} + >=dev-util/opencl-headers-2022.05.18-r1" S="${WORKDIR}/${MY_P}" multilib_src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test) - -DOPENCL_ICD_LOADER_HEADERS_DIR="${EPREFIX}/usr/include" ) cmake_src_configure } multilib_src_test() { - OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" \ + local -x OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" + local -x OCL_ICD_VENDORS="/dev/null" cmake_src_test } |