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 B34511396D1 for ; Thu, 28 Sep 2017 13:19:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 136B32BC008; Thu, 28 Sep 2017 13:19:17 +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 E783A2BC008 for ; Thu, 28 Sep 2017 13:19:16 +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 0FDA03416EE for ; Thu, 28 Sep 2017 13:19:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 981939078 for ; Thu, 28 Sep 2017 13:19:12 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1506604504.285426ee4a05c7a3c2a5159bdb73f76c3f6fbec1.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 285426ee4a05c7a3c2a5159bdb73f76c3f6fbec1 X-VCS-Branch: master Date: Thu, 28 Sep 2017 13:19:12 +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: 067848ff-dc9c-4b73-9eef-d8ca97972604 X-Archives-Hash: 738d33cbf4711d91343a5929cb38f392 commit: 285426ee4a05c7a3c2a5159bdb73f76c3f6fbec1 Author: Michał Górny gentoo org> AuthorDate: Sun Sep 17 08:51:39 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Sep 28 13:15:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285426ee media-libs/mesa: Split LLVM RDEP into sep block Split the LLVM RDEPEND into a separate block for improved readability when I start hacking on it. media-libs/mesa/mesa-9999.ebuild | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 4a8ab358f93..d9a7ac09fcc 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -97,7 +97,6 @@ RDEPEND=" llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] - vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) ) video_cards_r600? ( virtual/libelf:0=[${MULTILIB_USEDEP}] @@ -105,7 +104,6 @@ RDEPEND=" video_cards_radeon? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) - >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] ) opencl? ( app-eselect/eselect-opencl @@ -139,6 +137,18 @@ RDEPEND="${RDEPEND} video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) " +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. +RDEPEND="${RDEPEND} + llvm? ( + video_cards_radeonsi? ( + vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) + ) + >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] + ) +" + # FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once # LLVM < 3.9 is out of the game DEPEND="${RDEPEND}