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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6D0D4158649 for ; Fri, 12 May 2023 17:18:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A884EE08D4; Fri, 12 May 2023 17:18:58 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8A137E08D4 for ; Fri, 12 May 2023 17:18:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0719340DAE for ; Fri, 12 May 2023 17:18:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D5C4A67 for ; Fri, 12 May 2023 17:18:56 +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: <1683911922.6c4bdcbd3b25bdc3b4ccd6ab7d839840dbbef813.mattst88@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: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 6c4bdcbd3b25bdc3b4ccd6ab7d839840dbbef813 X-VCS-Branch: master Date: Fri, 12 May 2023 17:18:56 +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: 7fa7ea27-90c9-4134-a815-0d4c6b91822e X-Archives-Hash: 21d7d258784583a5764981d2c2122d10 commit: 6c4bdcbd3b25bdc3b4ccd6ab7d839840dbbef813 Author: Matt Turner gentoo org> AuthorDate: Thu May 11 20:04:14 2023 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri May 12 17:18:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4bdcbd media-libs/mesa: Simplify LLVM dependencies Specifically, just always require that sys-devel/llvm (or sys-devel/clang) is built with LLVM_TARGETS=AMDGPU. It's been in package.use.force since llvm:13 and seems unlikely to be removed. It also massively simplifies the dependencies. Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-9999.ebuild | 68 ++++++---------------------------------- 1 file changed, 9 insertions(+), 59 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 636061a77169..e5976cb09708 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -107,69 +107,25 @@ RDEPEND="${RDEPEND} # 2. Update the := to specify *max* version, e.g. < 10. # 3. Specify LLVM_MAX_SLOT, e.g. 9. LLVM_MAX_SLOT="16" +LLVM_USE_DEPS="llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}" LLVM_DEPSTR=" || ( - sys-devel/llvm:16[${MULTILIB_USEDEP}] - sys-devel/llvm:15[${MULTILIB_USEDEP}] + sys-devel/@@@@:16[${LLVM_USE_DEPS}] + sys-devel/@@@@:15[${LLVM_USE_DEPS}] ) -