From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id LrUnGeERVGQ1/gAASxT56A (envelope-from ) for ; Thu, 04 May 2023 22:13:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id wArsFuERVGQJNAEAG6o9tA (envelope-from ) for ; Thu, 04 May 2023 22:13:21 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E1FECBD34 for ; Thu, 4 May 2023 22:13:20 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pufK5-0007Om-MP; Thu, 04 May 2023 16:13:05 -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 1pufK3-0007MB-BF for guix-patches@gnu.org; Thu, 04 May 2023 16:13:03 -0400 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 1pufK3-0006ql-2U for guix-patches@gnu.org; Thu, 04 May 2023 16:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pufK2-00089L-US for guix-patches@gnu.org; Thu, 04 May 2023 16:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63219] [PATCH mesa-branch v3 2/4] gnu: mesa: Use gexps instead of quasiquote. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 May 2023 20:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63219@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 63219-submit@debbugs.gnu.org id=B63219.168323117931294 (code B ref 63219); Thu, 04 May 2023 20:13:02 +0000 Received: (at 63219) by debbugs.gnu.org; 4 May 2023 20:12:59 +0000 Received: from localhost ([127.0.0.1]:52151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufJz-00088g-7c for submit@debbugs.gnu.org; Thu, 04 May 2023 16:12:59 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:41375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pufJw-00088E-M3 for 63219@debbugs.gnu.org; Thu, 04 May 2023 16:12:58 -0400 Date: Thu, 04 May 2023 20:12:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1683231170; x=1683490370; bh=abL49T01FaUnnuiWiAbanAWJ19wckPkCkExifB/K8t4=; 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=nv4wAdKyDKd9HQiyEs9PRWdPQBIIg+YkWTfkK5dyy/LdNa0gEW5XdzHzFSoslFEtg YueIpquz/DF9e2wFl5xF9OtH+6iBRiXNMmC84sHg8TlApTwZ4eUbSA1SttAeTG4kSW /aFfG668qJpiOIblr/kvW4dwAG36clYmS7Nr3af/F3hdvY4+C8rlZbxANGvPOJTMRk XS+Pw9kYfn7j+DkoulU6maBV//x+9Oq1ZmmEnJQsYaPPZ739B74Nv539Lkl24rnUKJ Nec2wCA8eSK9JtAY14hUf2VzuJ2Dvizd3BkyzaH4zF4wbqi/pyc1qYAaKoxJQ/Vxg0 w+xqsiv6mHsiA== Message-ID: <7ff21afd6c6446d9f986ecf6982b41722fed81ac.1683230943.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches From: Kaelyn Takata via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683231201; a=rsa-sha256; cv=none; b=PeRbcuOlT0mLrgVdhS7STj8KO97SsQU/G+4b26XfEULW4yIlNmULhpeHBBWRwzgJL5ODj6 edRCbKd6jrtkTaw1GlQNp3M5a23tRvbHNQS9WSnLi7hmoylKo008wtijnyp2CuaYzo25ss D/G9Fv7OsSIifXeHgDwE97GWx4IQopGP0s23TMlT0Ilol9oCfAO0s0gYSmmBnfHNVtGJmV EWhOCpBvXnttvSBzEVbzUbOlCO9zZqzFXlKxeZ1VYqVkkdC7yOcAxTICTfMQFZvvYPvnG5 p2lwXTR2zcRmV9VFuyQR/hUfhdKbvHrCLwTFtSzljnOdze87xN9T0rDfUt8Mqw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=nv4wAdKy; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683231201; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=abL49T01FaUnnuiWiAbanAWJ19wckPkCkExifB/K8t4=; b=bw0CBtjF+6LQrkkhCBFiD+StFAmrLM92eJxeNUbzI8IJyluRjbUXaNC9oTV/oq1LbHOcF/ M2+IBaTF2d16+YciVBSZ/21RQ6S9LrU4W75ZiLgc5j0I6yJt3rMLuK+IEFtPZ33IkLfAEU M9w9FILDsr2OsM70fGvB8BkXLD7KsVd2MDIFdK/l39qSJ8GvdbdgvoW7UxnZjfrSBLpVGy b/pBpXZqhcAoSQRHDTvJDBLrjTpk6XmT4TH1Uugv8tKs/yVgdesnMWvp6b9v8Yv2xC8zd7 TrWIzXVObSRHXi1Kv/A2JPk4NV80/k+QOyjdLgmn21cszj9Lsae/X2+8F7+Ysw== X-Migadu-Spam-Score: -3.00 X-Spam-Score: -3.00 X-Migadu-Queue-Id: E1FECBD34 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=nv4wAdKy; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: uJuEcKIdp7/7 * gnu/packages/gl.scm (mesa)[arguments]: Use gexps instead of quasiquote. --- gnu/packages/gl.scm | 48 +++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 6521170ebb..f705b864f1 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -315,8 +315,10 @@ (define-public mesa (@ (gnu packages base) which))) (outputs '("out" "bin")) (arguments - `(#:configure-flags - '(,@(match (%current-system) + (list + #:configure-flags + #~(list + #$@(match (%current-system) ("aarch64-linux" ;; TODO: Fix svga driver for non-Intel architectures. '("-Dgallium-drivers=3Detnaviv,freedreno,kmsro,lima,nouveau,= \ @@ -345,7 +347,7 @@ (define-public mesa "-Dshared-glapi=3Denabled" ;; Explicitly enable Vulkan on some architectures. - ,@(match (%current-system) + #$@(match (%current-system) ((or "i686-linux" "x86_64-linux") '("-Dvulkan-drivers=3Dintel,amd")) ((or "powerpc64le-linux" "powerpc-linux") @@ -369,12 +371,12 @@ (define-public mesa ;; documentation recommends using 'release' for performance anyway. #:build-type "release" - #:modules ((ice-9 match) - (srfi srfi-1) - (guix build utils) - (guix build meson-build-system)) + #:modules '((ice-9 match) + (srfi srfi-1) + (guix build utils) + (guix build meson-build-system)) #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'unpack 'disable-failing-test (lambda _ ;; Disable the intel vulkan (anv_state_pool) tests, as they m= ay @@ -383,7 +385,7 @@ (define-public mesa (substitute* "src/intel/vulkan/meson.build" (("if with_tests") "if false")) - ,@(match (%current-system) + #$@(match (%current-system) ("riscv64-linux" ;; According to the test logs the llvm JIT is not design= ed ;; for this architecture and the llvmpipe tests all segf= ault. @@ -428,8 +430,8 @@ (define-public mesa (_ '((display "No tests to disable on this architecture.\n"= )))))) (add-before 'configure 'fix-dlopen-libnames - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (lambda _ + (let ((out #$output)) ;; Remain agnostic to .so.X.Y.Z versions while doing ;; the substitutions so we're future-safe. (substitute* "src/glx/meson.build" @@ -446,9 +448,9 @@ (define-public mesa (("\"gbm_dri\\.so") (string-append "\"" out "/lib/dri/gbm_dri.so")))))) (add-after 'install 'split-outputs - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) + (lambda _ + (let ((out #$output) + (bin #$output:bin)) ;; Not all architectures have the Vulkan overlay control sc= ript. (mkdir-p (string-append out "/bin")) (call-with-output-file (string-append out "/bin/.empty") @@ -457,13 +459,13 @@ (define-public mesa (string-append bin "/bin")) (delete-file-recursively (string-append out "/bin"))))) (add-after 'install 'symlinks-instead-of-hard-links - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; All the drivers and gallium targets create hard links upon ;; installation (search for "hardlink each megadriver instanc= e" ;; in the makefiles). This is no good for us since we'd prod= uce ;; nars that contain several copies of these files. Thus, tu= rn ;; them into symlinks, which saves ~124 MiB. - (let* ((out (assoc-ref outputs "out")) + (let* ((out #$output) (lib (string-append out "/lib")) (files (find-files lib (lambda (file stat) @@ -491,8 +493,8 @@ (define-public mesa others)))) (delete-duplicates inodes))))) (add-after 'install 'set-layer-path-in-manifests - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) + (lambda _ + (let* ((out #$output) (implicit-path (string-append out "/share/vulkan/implicit_layer.d/")) @@ -529,7 +531,7 @@ (define-public mesa-opencl (arguments (substitute-keyword-arguments (package-arguments mesa) ((#:configure-flags flags) - `(cons "-Dgallium-opencl=3Dstandalone" ,flags)))) + #~(cons "-Dgallium-opencl=3Dstandalone" #$flags)))) (inputs (modify-inputs (package-inputs mesa) (prepend libclc))) @@ -543,10 +545,10 @@ (define-public mesa-opencl-icd (arguments (substitute-keyword-arguments (package-arguments mesa) ((#:configure-flags flags) - `(cons "-Dgallium-opencl=3Dicd" - ,(delete "-Dgallium-opencl=3Dstandalone" flags))) + #~(cons "-Dgallium-opencl=3Dicd" + (delete "-Dgallium-opencl=3Dstandalone" #$flags))) ((#:phases phases) - `(modify-phases ,phases + #~(modify-phases #$phases (add-after 'install 'mesa-icd-absolute-path (lambda _ ;; Use absolute path for OpenCL platform library. @@ -554,7 +556,7 @@ (define-public mesa-opencl-icd ;; for ICD in our applications to find OpenCL platform. (use-modules (guix build utils) (ice-9 textual-ports)) - (let* ((out (assoc-ref %outputs "out")) + (let* ((out #$output) (mesa-icd (string-append out "/etc/OpenCL/vendors/m= esa.icd")) (old-path (call-with-input-file mesa-icd get-string= -all)) (new-path (string-append out "/lib/" (string-trim-b= oth old-path)))) -- 2.39.2