From patchwork Fri Sep 6 15:07:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67669 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8FA6027BBEA; Fri, 6 Sep 2024 16:08:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 521F327BBE2 for ; Fri, 6 Sep 2024 16:08:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaZE-0007J9-41; Fri, 06 Sep 2024 11:08:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smaZA-0007A4-8J for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smaZ9-0003Sy-W1 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=3QuD1enhSII2XPlPVxw7oWPa1tRNJHZDbGtM7otmlPs=; b=ackgt+gDy+sehDLWgODDSWvFN6s1qijXe5bQgphhYZnTHoK7YHIuiJ4ksA9eZ3NN1TK4vbpmHatSWEy+M0JUzXOVzPPbStBLWxXYdn3PtDNQIty2/3qDoZDboznw0g7ICDiNZKnHAZLMFMAoO6Or9cwb9Ed6fwSAveP4xtXknwuLkeg5DaIlvDFvktr73fSUaTtIiWZKZsoimt/ZT43XgEDqU/LwD6ZChQn47HVxuZxAVPmGV+y3nLlX4pZ+zOeSq7HWGQsUotcFO6dLFCH7UbDizmfDpJXMIr+sla0FAI4gGSDgskXLyz3GkBG9td3gFsNnHF7PfSXESznN9jyEbw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaZ9-000540-FT for guix-patches@gnu.org; Fri, 06 Sep 2024 11:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 6/8] gnu: llvm-for-mesa: Update to llvm-18. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73071@debbugs.gnu.org Cc: John Kehayias , aurtzy@gmail.com, efraim@flashner.co.il Received: via spool by 73071-submit@debbugs.gnu.org id=B73071.172563527319424 (code B ref 73071); Fri, 06 Sep 2024 15:08:03 +0000 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:07:53 +0000 Received: from localhost ([127.0.0.1]:53820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYz-00053E-Fu for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:53 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:37385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaYx-00052z-Ud for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:07:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635265; x=1725894465; bh=3QuD1enhSII2XPlPVxw7oWPa1tRNJHZDbGtM7otmlPs=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=lS+E4Ot3mkoYE0NkVP262Nbp0Fi1vrd436uzRVj5V07MUE5YwZS/jgtdZGuHInMna ohp3a6B4WFRX4GIX67rt1hkKl0ZcSibsPSbOC7Y/monGftTCBGjQ8BYfRMxiQ2uB14 micpSnfDmzVk/sdCnJOytot+wFPOXIHj7mh2sAwBby8q2IXNzpPiupGymLDMdX3kTk jrz+4V8bNmrJJ1A4vXgdEfOU1c75mbiwi26zIlUe/aE5KRxTzqdzvxkKWvnzNK8Qir nUHQaum/5zHElVRVeAe3ieXlNZEMphpwy9Kflh0pwym1UdHLLYu2zXuL8u6qTY3z0Z qUtWIzC3ajJvA== Date: Fri, 06 Sep 2024 15:07:41 +0000 Message-ID: <6037f5e17a5c583fbdc38e75ba88f7122b44e180.1725634153.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 43be75a3591ba832af31d61e0d1e44b8d2b71d37 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/llvm.scm (llvm-for-mesa): Update to llvm-18. * gnu/packages/gl.scm (mesa)[inputs]: Always use llvm-for-mesa (remove llvm-18 for aarch64 to use llvm-for-mesa). (mesa-opencl)[native-inputs]: Remove clang-15. Add clang-18. Change-Id: I767d40d62a827864d3d109c44f82a43302875eb8 --- gnu/packages/gl.scm | 8 ++++---- gnu/packages/llvm.scm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) -- 2.45.2 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 849ca076dc..ab53b1761a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -323,15 +323,15 @@ (define-public mesa (inputs (append (if (target-aarch64?) - (list clang-18 - llvm-18) - (list llvm-for-mesa)) + (list clang-18) + '()) (list elfutils ;libelf required for r600 when using llvm expat (force libva-without-mesa) libxml2 libxrandr libxvmc + llvm-for-mesa vulkan-loader wayland wayland-protocols @@ -602,7 +602,7 @@ (define-public mesa-opencl (if (target-aarch64?) (package-native-inputs mesa) (modify-inputs (package-native-inputs mesa) - (prepend clang-15)))))) + (prepend clang-18)))))) (define-public mesa-opencl-icd (package/inherit mesa-opencl diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index fd2e815fe0..7fcb15891d 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -2152,7 +2152,7 @@ (define-public emacs-clang-rename (define-public llvm-for-mesa ;; Note: update the 'clang' input of mesa-opencl when bumping this. - (let ((base-llvm llvm-15)) + (let ((base-llvm llvm-18)) (package (inherit base-llvm) (name "llvm-for-mesa")