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 4CB88138351 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 46510E09E8; Wed, 8 Apr 2020 22:52:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 0C560E09E8 for ; Wed, 8 Apr 2020 22:52:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 113C034EFEE for ; Wed, 8 Apr 2020 22:52:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 61D3D9D 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: <1586386321.7126312f845d1535f401e25f3c60fc74f7a209f4.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/opencl-headers/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild dev-util/opencl-headers/opencl-headers-2020.03.13.ebuild X-VCS-Directories: dev-util/opencl-headers/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 7126312f845d1535f401e25f3c60fc74f7a209f4 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: e7265a12-f633-4711-8bad-38b14653fcd7 X-Archives-Hash: 97f4790b25b75b18afc4a183776f66d6 commit: 7126312f845d1535f401e25f3c60fc74f7a209f4 Author: Marek Szuba gentoo org> AuthorDate: Wed Apr 8 22:18:21 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Wed Apr 8 22:52:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7126312f dev-util/opencl-headers: install directly into /usr/include These cannot be in /usr/lib/OpenCL/vendor/... because eselect-opencl doesn't know how to handle unified headers, resulting in build failures due to missing header files. Seeing as we are planning to deprecate eselect-opencl soon anyway, adapt this and opencl-icd-loader to the new approach so that they can be used for transition testing without breaking the more established ICD loader i.e. ocl-icd. Note that this WILL cause massive dependency issues until opencl-icd-loader has been added to virtual/opencl. Use with caution. Signed-off-by: Marek Szuba gentoo.org> ...0.03.13.ebuild => opencl-headers-2020.03.13-r1.ebuild} | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dev-util/opencl-headers/opencl-headers-2020.03.13.ebuild b/dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild similarity index 50% rename from dev-util/opencl-headers/opencl-headers-2020.03.13.ebuild rename to dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild index 0c64e9cc994..917c0cad350 100644 --- a/dev-util/opencl-headers/opencl-headers-2020.03.13.ebuild +++ b/dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild @@ -3,8 +3,6 @@ EAPI=7 -inherit multilib-minimal - MY_PN="OpenCL-Headers" MY_P="${MY_PN}-${PV}" @@ -16,14 +14,13 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" +# To avoid file collisions in /usr/include/CL/ +DEPEND="!app-eselect/eselect-opencl" +RDEPEND="${DEPEND}" + S="${WORKDIR}/${MY_P}" -multilib_src_install() { - # Ideally we would install these directly into /usr/include but that would conflict - # with eselect-opencl, therefore we install these into the vendor directory used by - # dev-libs/opencl-icd-loader. Hopefully we will get this resolved soon and we can - # stop messing with multilib in this package. - local ocl_dir="/usr/$(get_libdir)/OpenCL/vendors/opencl-icd-loader" - insinto "${ocl_dir}"/include +src_install() { + insinto /usr/include doins -r "${S}"/CL }