From patchwork Thu Jan 19 13:56:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 46294 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 802C227BBED; Thu, 19 Jan 2023 13:58:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 9522227BBE9 for ; Thu, 19 Jan 2023 13:58:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIVPc-0000Fb-SU; Thu, 19 Jan 2023 08:57:04 -0500 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 1pIVPb-0000DL-F8 for guix-patches@gnu.org; Thu, 19 Jan 2023 08:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIVPb-0006Bw-0Z for guix-patches@gnu.org; Thu, 19 Jan 2023 08:57:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pIVPa-0002tR-S7 for guix-patches@gnu.org; Thu, 19 Jan 2023 08:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60934] [PATCH v2 1/2] gnu: Add llvm-for-mesa. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jan 2023 13:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60934 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60934@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Efraim Flashner Received: via spool by 60934-submit@debbugs.gnu.org id=B60934.167413658911058 (code B ref 60934); Thu, 19 Jan 2023 13:57:02 +0000 Received: (at 60934) by debbugs.gnu.org; 19 Jan 2023 13:56:29 +0000 Received: from localhost ([127.0.0.1]:42910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIVP3-0002sF-Be for submit@debbugs.gnu.org; Thu, 19 Jan 2023 08:56:29 -0500 Received: from mail-ej1-f53.google.com ([209.85.218.53]:34569) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIVOv-0002rZ-86 for 60934@debbugs.gnu.org; Thu, 19 Jan 2023 08:56:23 -0500 Received: by mail-ej1-f53.google.com with SMTP id az20so5910034ejc.1 for <60934@debbugs.gnu.org>; Thu, 19 Jan 2023 05:56:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=WxASoOmCUGCXUbz1fZU6ufYo6tUJI5Pz/Fre9jctfoo=; b=V1tM/ArIg4Ex0T6E2BIkDV8eQ4DrIMSJXlcTNKSsBpuJEuUk6oFxcwWFBKAJGJtX+f w/MmUjQkg69WDnRfZpZB4/AgQEXkw/WJbwmtgYyDUZN7LwcP0so557w8ZepCdGsic+pS Goq+pAyL4ZQTUDZrnNPonZrf6r+cahlH4jgMyFamN5atH+FtXpyTDHwpukG2EdIpsQyL idrPDlT0bbEEkdHH9Kx31BWCvae8/rKiTs9aP6bCgVfklHCpJXl8TL7hjPWeY9MLr5MH cCQKyax3837CcPaGagVY+nS1bQpN3sn0JvpasnXXa+ir+DZ8EBK56nSOtfQLs6/nS+hB O8pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WxASoOmCUGCXUbz1fZU6ufYo6tUJI5Pz/Fre9jctfoo=; b=HjUU7xEBNjdZnagojwwlrMzLT6yo3CQASnAx5CVfi6iLRJqXwuvd6zB/ABD45/Gd4c EqDIiTwPgn4J7cpvD3N7wlG5QySlNp57I4zs7nWmTvvkM5epE+zvR3W1MSTHSVucgVT9 tZMK4Ae1P9kS4tZizis5XBLyuSU9z90G0wXjUFzK1RifXqMnEgcyucVuJ3hCopkszjXt dk0wOzzvFhjlq2CSuqdE/U8BiiOhm+L4U4giTdox1j1LE51nH5oac6HUvnzehyD+vw5u TW7doL4dmuB3gsqXw09eSK3WLrTT+4eBwHftz/pCa/UXBpMhcdrHnjkShiRU+P+JF/wQ gZVw== X-Gm-Message-State: AFqh2krrjHOIUlVy7VlZDg6vKoi7YFvNUWKUbeWpe96pqXQH14CXIwsy AvCVN58fMocKPT+4zIJP5gotrz7QArJvDw== X-Google-Smtp-Source: AMrXdXs7Hsrtwiye8QeK4XNqD3o0L8s6Qk5n3wFSXLpSiOwExLQ/6IBrfYU8hB3sKWvdtljDgYRYbA== X-Received: by 2002:a17:906:3795:b0:84d:1366:c74d with SMTP id n21-20020a170906379500b0084d1366c74dmr6820396ejc.63.1674136575569; Thu, 19 Jan 2023 05:56:15 -0800 (PST) Received: from localhost ([2a02:ed3:910:1100:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id lb14-20020a170907784e00b007c0fd177c0bsm16119618ejc.46.2023.01.19.05.56.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 05:56:15 -0800 (PST) From: Efraim Flashner Date: Thu, 19 Jan 2023 15:56:03 +0200 Message-Id: <37a43bcd770f26694343af3ae0534208dc052055.1674136307.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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: , 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): New variable. --- gnu/packages/llvm.scm | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 58bd91d7be..8379b23fa5 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -2070,6 +2070,55 @@ (define-public emacs-clang-rename ;;; LLVM variants. ;;; +(define-public llvm-for-mesa + ;; Note: update the 'clang' input of mesa-opencl when bumping this. + (let ((base-llvm llvm-15)) + (package + (inherit base-llvm) + (arguments + (substitute-keyword-arguments (package-arguments base-llvm) + ((#:modules modules '((guix build cmake-build-system) + (guix build utils))) + `((ice-9 regex) + (srfi srfi-1) + (srfi srfi-26) + ,@modules)) + ((#:configure-flags cf ''()) + #~(cons* + ;; AMDGPU is needed by the vulkan drivers. + #$(string-append "-DLLVM_TARGETS_TO_BUILD=" + (system->llvm-target) ";AMDGPU") + ;; Tools and utils decrease the output by ~100 MiB. + "-DLLVM_BUILD_TOOLS=NO" + (remove (cut string-match + "-DLLVM_(TARGETS_TO_BUILD|INSTALL_UTILS).*" <>) + #$cf))) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'install 'delete-static-libraries + ;; If these are just relocated then llvm-config can't find them. + (lambda* (#:key outputs #:allow-other-keys) + (for-each delete-file + (find-files (string-append + (assoc-ref outputs "out") "/lib") + "\\.a$")))) + (add-after 'install 'build-and-install-llvm-config + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* + "tools/llvm-config/CMakeFiles/llvm-config.dir/link.txt" + (((string-append "/tmp/guix-build-llvm-" + #$(package-version base-llvm) + ".drv-0/build/lib")) + (string-append out "/lib"))) + (invoke "make" "llvm-config") + (install-file "bin/llvm-config" + (string-append out "/bin"))))))))) + ;; We don't override the name so we hide it so we don't have package + ;; ambiguities from the CLI. + (properties `((hidden? . #t) + ,@(package-properties base-llvm)))))) + (define make-ocaml-llvm ;; Make it a memoizing procedure so its callers below don't end up defining ;; two equal-but-not-eq "ocaml-llvm" packages for the default LLVM.