From patchwork Fri Sep 6 15:07:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 67670 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 228D927BBEA; Fri, 6 Sep 2024 16:09:10 +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 B239227BBE2 for ; Fri, 6 Sep 2024 16:09:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smaa9-0002Hq-VZ; Fri, 06 Sep 2024 11:09:06 -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 1smaa7-0002HR-JQ for guix-patches@gnu.org; Fri, 06 Sep 2024 11:09:03 -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 1smaa6-0003XY-G9 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:09:03 -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=xBxUhjI+hJzkso+BzQruSK1bBQD5lEhT+e/ZPcVQKfk=; b=umI0YikZuJj0qY7okRNpN94qNbIsjEQ+OhAACfsRoKlkjQVW4+50qxouOHgcA1dvKyUdeyZq7W6eTOFbKkqU86f52pmlRb9eHMxI/vFN26v2mGszgFP6KLhWvlpXboyj35xDsbmiVrH/b6KUe6bULsSfm7Dq5epOsRQ0wZIWBjEM8j+59mq6bpb9L2p3YEabInKRDE1y8/NY7zxWuReX8xaBtSepuFpiYs/DFpzkaqybvJ3vb5hrth7WbvZDb5AXgiqzPF0HDp4FQjjJJdUjzyA99VRHaBwbVg8XvNQVW/V4ZQm+jkzNMGB/RfpAhWM+AzqE1UeiXAzHLIcU6INvIQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smaa5-00055s-VF for guix-patches@gnu.org; Fri, 06 Sep 2024 11:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73071] [PATCH mesa-updates 7/8] gnu: llvm-for-mesa: Build all targets. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:09:01 +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.172563529119504 (code B ref 73071); Fri, 06 Sep 2024 15:09:01 +0000 Received: (at 73071) by debbugs.gnu.org; 6 Sep 2024 15:08:11 +0000 Received: from localhost ([127.0.0.1]:53828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaZG-00054V-Tb for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:08:11 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:53927) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smaZE-000542-MT for 73071@debbugs.gnu.org; Fri, 06 Sep 2024 11:08:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725635283; x=1725894483; bh=xBxUhjI+hJzkso+BzQruSK1bBQD5lEhT+e/ZPcVQKfk=; 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=KBch0QeAagOCqTuxUWBAMUpsWGM/RlAdMRvMcaCgdv0VivXeJydBnleQY9d/rKwfB 5MNY0q/+mz9KiuLxsBFCE0zq0X6eXXfO9k7RX0xGvZV2nEYelbhsOAYPeCxirRK420 utO8tfk5BEWTzNfxGRpYQDO99/QD6eQfyjHetHtxqfL5j+rM6KeYHYifqKU7uWkxvf I2Houu0synwGz7Ek0YNmdIpIiJuQ/s/CicVZemnpIwxlTwLo7KLUf+wmC1wnQ1nF1B 6bJ4aXr05FAgKOBwanTckDZZSUQW7XckX/UNT3zR3FgnTw/lli92TCw1HsqH1i5vOn uMh43NuuWxVZg== Date: Fri, 06 Sep 2024 15:07:59 +0000 Message-ID: <0ff4c2660a52582beaeb88706fee678da4847e73.1725634153.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 01788e3613bfb797c2abb2beca352ac0d07a3256 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 This change is needed for updating mesa to 24.2.1. Otherwise, mesa fails to build. For example, linking intel_clc fails with errors of libclang-cpp.so having undefined references to various LLVM targets. It is possible that just some LLVM targets could be built or a modified version of the clang input for mesa (now required) could be used to try to reduce the closure size as before. * gnu/packages/llvm.scm (llvm-for-mesa)[arguments]: Don't set the LLVM_TARGETS_TO_BUILD configure flag. Also, don't remove it from the inherited configure-flags. Fix indentation. Change-Id: I4a2b7239e6ea77b0d3bce10bdf945691faa84994 --- gnu/packages/llvm.scm | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) -- 2.45.2 diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 7fcb15891d..800fe29599 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2022, 2024 Greg Hogan -;;; Copyright © 2022 John Kehayias +;;; Copyright © 2022, 2024 John Kehayias ;;; Copyright © 2022 Clément Lassieur ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2023 Hilton Chain @@ -2166,21 +2166,18 @@ (define-public llvm-for-mesa ,@modules)) ((#:configure-flags cf ''()) #~(cons* - ;; AMDGPU is needed by the vulkan drivers. - #$(string-append "-DLLVM_TARGETS_TO_BUILD=" - (system->llvm-target) ";AMDGPU") - #$@(if (%current-target-system) - '("-DBUILD_SHARED_LIBS:BOOL=TRUE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") + #$@(if (%current-target-system) + '("-DBUILD_SHARED_LIBS:BOOL=TRUE" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") '()) - ;; Skipping tools and utils decreases the output by ~100 MiB. - "-DLLVM_BUILD_TOOLS=NO" - (remove - (cut string-match - #$(if (%current-target-system) - "-DLLVM_(LINK_LLVM_DYLIB|TARGETS_TO_BUILD|INSTALL_UTILS).*" - "-DLLVM_(TARGETS_TO_BUILD|INSTALL_UTILS).*") <>) - #$cf))) + ;; Skipping tools and utils decreases the output by ~100 MiB. + "-DLLVM_BUILD_TOOLS=NO" + (remove + (cut string-match + #$(if (%current-target-system) + "-DLLVM_(LINK_LLVM_DYLIB|INSTALL_UTILS).*" + "-DLLVM_INSTALL_UTILS.*") <>) + #$cf))) ((#:phases phases '%standard-phases) #~(modify-phases #$phases #$@(if (%current-target-system)