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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1412D158095 for ; Wed, 7 Sep 2022 15:42:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23755E085A; Wed, 7 Sep 2022 15:42:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CDD6E085A for ; Wed, 7 Sep 2022 15:42:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08958341228 for ; Wed, 7 Sep 2022 15:42:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9828A576 for ; Wed, 7 Sep 2022 15:42:48 +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: <1662565365.f8a008ea9f06f55adac6692c648f2de60f386a9c.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-icd-loader/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18-r1.ebuild dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild X-VCS-Directories: dev-libs/opencl-icd-loader/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: f8a008ea9f06f55adac6692c648f2de60f386a9c X-VCS-Branch: master Date: Wed, 7 Sep 2022 15:42:48 +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: 595448ea-3f72-4b9c-9c2c-1260f856f72f X-Archives-Hash: 3df03c074d6ef71d36f79819e766f85c commit: f8a008ea9f06f55adac6692c648f2de60f386a9c Author: Marek Szuba gentoo org> AuthorDate: Wed Sep 7 15:38:55 2022 +0000 Commit: Marek Szuba gentoo org> CommitDate: Wed Sep 7 15:42:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a008ea 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 gentoo.org> ...2.05.18.ebuild => opencl-icd-loader-2022.05.18-r1.ebuild} | 12 +++++++----- 1 file 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 similarity index 65% rename from dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild rename to 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 }