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 7F812138334 for ; Fri, 19 Oct 2018 17:47:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74A9BE07A7; Fri, 19 Oct 2018 17:47:10 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 2BC15E07A7 for ; Fri, 19 Oct 2018 17:47:10 +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 65B81335C5B for ; Fri, 19 Oct 2018 17:47:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C7EB439 for ; Fri, 19 Oct 2018 17:47:07 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1539971215.9599894aef4f3cbc1ff704cc2a5a8aaa2c64baba.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/ocl-icd/metadata.xml dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild X-VCS-Directories: dev-libs/ocl-icd/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 9599894aef4f3cbc1ff704cc2a5a8aaa2c64baba X-VCS-Branch: master Date: Fri, 19 Oct 2018 17:47:07 +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-Archives-Salt: e2319454-e675-44b6-ba13-7902411c1ac9 X-Archives-Hash: 8697f335c18ad8315155d3b68ab62f46 commit: 9599894aef4f3cbc1ff704cc2a5a8aaa2c64baba Author: Jan Vesely gmail com> AuthorDate: Wed Oct 10 06:33:25 2018 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Oct 19 17:46:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9599894a dev-libs/ocl-icd-2.2.12: Install headers and drop ocl-icd.icd Add useflag to install khronos CL headers. Don't install ocl-icd.icd to /etc/. v2: Don't try to move docs. It's not necessary. v3: Fixup ruby depend Signed-off-by: Jan Vesely gmail.com> Closes: https://github.com/gentoo/gentoo/pull/10122 Signed-off-by: Matt Turner gentoo.org> dev-libs/ocl-icd/metadata.xml | 5 +++++ dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild | 29 ++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dev-libs/ocl-icd/metadata.xml b/dev-libs/ocl-icd/metadata.xml index f3de5f693ed..1cfa787eaf1 100644 --- a/dev-libs/ocl-icd/metadata.xml +++ b/dev-libs/ocl-icd/metadata.xml @@ -5,4 +5,9 @@ patrick@gentoo.org Patrick Lauer + + + Install Khronos OpenCL headers. + + diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild index f102277aa8f..6d59cbc6210 100644 --- a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild +++ b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild @@ -3,7 +3,8 @@ EAPI=7 -inherit autotools flag-o-matic multilib-minimal +USE_RUBY="ruby23 ruby24 ruby25" +inherit autotools flag-o-matic multilib-minimal ruby-single DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders" HOMEPAGE="https://github.com/OCL-dev/ocl-icd" @@ -12,10 +13,9 @@ LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="+khronos-headers" -DEPEND="dev-lang/ruby - dev-ruby/rubygems" +DEPEND="${RUBY_DEPS}" RDEPEND="app-eselect/eselect-opencl" src_prepare() { @@ -30,16 +30,23 @@ multilib_src_configure() { } multilib_src_install() { + default + + # Drop .la files find "${D}" -name '*.la' -delete || die - echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > "${PN}-${ABI}.icd" - insinto /etc/OpenCL/vendors/ - doins "${PN}-${ABI}.icd" + OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd" + dodir ${OCL_DIR}/{,include} - emake DESTDIR="${D}" install + # Install vendor library + mv -f "${D}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library" - OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/ - mkdir -p ${OCL_DIR} || die "mkdir failed" + # Install vendor headers + if use khronos-headers; then + cp -r "${S}/khronos-headers/CL" "${ED}${OCL_DIR}/include" || die "Can't install vendor headers" + fi +} - mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}" +pkg_postinst() { + eselect opencl set --use-old ${PN} }