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 7303E1382C5 for ; Sat, 17 Mar 2018 09:29:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87678E0814; Sat, 17 Mar 2018 09:29:18 +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 5CE68E0814 for ; Sat, 17 Mar 2018 09:29:18 +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 F3A28335C7A for ; Sat, 17 Mar 2018 09:29:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FBB7232 for ; Sat, 17 Mar 2018 09:29:15 +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: <1521278945.7ad4da2b626af9208eb0398691f5e77fdb332455.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/beignet/beignet-1.3.2.ebuild X-VCS-Directories: dev-libs/beignet/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 7ad4da2b626af9208eb0398691f5e77fdb332455 X-VCS-Branch: master Date: Sat, 17 Mar 2018 09:29:15 +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: 7066c9c1-5ab4-4d57-b4dd-07f7369f1b8f X-Archives-Hash: 52d41197b5195fa418230fc4433e857f commit: 7ad4da2b626af9208eb0398691f5e77fdb332455 Author: Marek Szuba gentoo org> AuthorDate: Sat Mar 17 09:28:16 2018 +0000 Commit: Marek Szuba gentoo org> CommitDate: Sat Mar 17 09:29:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad4da2b dev-libs/beignet: play nicely with slotted LLVM The version cap added by 2e80ee40ee74cc3005945355fd1a67ef4347ebbd was not sufficient to solve Bug #650136 because although it did prevent Beignet from pulling in slot 6 of sys-devel/llvm and sys-devel/clang on fresh installations, it did nothing to avoid using these if already installed. Thanks to the use of llvm.eclass this now no longer happens; I have just tested this on a system with llvm6 installed and beignet still ended up using llvm5. Closes: https://bugs.gentoo.org/650136 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-libs/beignet/beignet-1.3.2.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild index c3f83128332..6624d286bcc 100644 --- a/dev-libs/beignet/beignet-1.3.2.ebuild +++ b/dev-libs/beignet/beignet-1.3.2.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) CMAKE_BUILD_TYPE="Release" -inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs +inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs DESCRIPTION="OpenCL implementation for Intel GPUs" HOMEPAGE="https://01.org/beignet" @@ -27,7 +27,6 @@ fi COMMON="media-libs/mesa[${MULTILIB_USEDEP}] =x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libXfixes[${MULTILIB_USEDEP}]" @@ -38,6 +37,8 @@ DEPEND="${COMMON} ocl-icd? ( dev-libs/ocl-icd ) virtual/pkgconfig" +LLVM_MAX_SLOT=5 + PATCHES=( "${FILESDIR}"/no-debian-multiarch.patch "${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch @@ -62,6 +63,7 @@ pkg_pretend() { } pkg_setup() { + llvm_pkg_setup python_setup }