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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 14B67138350 for ; Wed, 8 Apr 2020 22:52:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39E35E09CA; Wed, 8 Apr 2020 22:52:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A7F2E09CA for ; Wed, 8 Apr 2020 22:52:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4E5034EFC9 for ; Wed, 8 Apr 2020 22:52:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7AA171C1 for ; Wed, 8 Apr 2020 22:52:30 +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: <1586386325.a575f9498cb5e6e8520c5cd801211e6d0dfccd09.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-2020.03.13-r1.ebuild dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13.ebuild X-VCS-Directories: dev-libs/opencl-icd-loader/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: a575f9498cb5e6e8520c5cd801211e6d0dfccd09 X-VCS-Branch: master Date: Wed, 8 Apr 2020 22:52:30 +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: c87d20a6-e3e2-4a21-9a70-cf33db73974c X-Archives-Hash: 0dcce7272ceb68e9c77667d2029f63b2 commit: a575f9498cb5e6e8520c5cd801211e6d0dfccd09 Author: Marek Szuba gentoo org> AuthorDate: Wed Apr 8 22:29:06 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Wed Apr 8 22:52:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a575f949 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 gentoo.org> ....13.ebuild => opencl-icd-loader-2020.03.13-r1.ebuild} | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) 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 617e29a65dd..82bb5e6b4d8 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}" -}