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 C36DD138334 for ; Mon, 7 Oct 2019 12:23:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF945E0801; Mon, 7 Oct 2019 12:23:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 B3CEAE0801 for ; Mon, 7 Oct 2019 12:23:13 +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 419EC34B9FA for ; Mon, 7 Oct 2019 12:23:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F11982F for ; Mon, 7 Oct 2019 12:23:10 +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: <1570450963.edfe01afc3718d43fd5c00dd9aefa56416a84898.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild X-VCS-Directories: dev-libs/opencl-clang/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: edfe01afc3718d43fd5c00dd9aefa56416a84898 X-VCS-Branch: master Date: Mon, 7 Oct 2019 12:23:10 +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: efd52ca0-87fb-4ddd-98fe-13edebc948bc X-Archives-Hash: 59be5801f4c3ecbe23a3c404e2b14028 commit: edfe01afc3718d43fd5c00dd9aefa56416a84898 Author: Marek Szuba gentoo org> AuthorDate: Mon Oct 7 12:13:12 2019 +0000 Commit: Marek Szuba gentoo org> CommitDate: Mon Oct 7 12:22:43 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edfe01af dev-libs/opencl-clang: pass $LLVM_MAX_SLOT to get_llvm_prefix() When invoked without max_slot, get_llvm_prefix() iterates over *all* LLVM slots known to llvm.eclass - including those exceeding LLVM_MAX_SLOT. As a consequence, an ebuild can e.g. end up getting installed into llvm:9 directories in spite of having been linked against llvm:8. Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Marek Szuba gentoo.org> .../opencl-clang-8.0.1_p20191001-r1.ebuild | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild new file mode 100644 index 00000000000..616cb77c650 --- /dev/null +++ b/dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-multilib llvm vcs-snapshot + +EGIT_COMMIT="94af090661d7c953c516c97a25ed053c744a0737" + +DESCRIPTION="OpenCL-oriented thin wrapper library around clang" +HOMEPAGE="https://github.com/intel/opencl-clang" +SRC_URI="https://github.com/intel/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="UoI-NCSA" +SLOT="8" +KEYWORDS="~amd64" + +BDEPEND="dev-vcs/git" +COMMON="sys-devel/clang:8=[static-analyzer,${MULTILIB_USEDEP}]" +DEPEND="${COMMON} + dev-util/spirv-llvm-translator:8=[${MULTILIB_USEDEP}]" +RDEPEND="${COMMON}" + +LLVM_MAX_SLOT=8 + +PATCHES=( + "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch +) + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})" + -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang + ) + cmake-utils_src_configure +}