From patchwork Sun Nov 19 17:10:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Skyler Ferris X-Patchwork-Id: 56643 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 38FFD27BBE2; Sun, 19 Nov 2023 17:12:18 +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=-2.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable 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 3D70E27BBE9 for ; Sun, 19 Nov 2023 17:12:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4lL1-0002Td-Nq; Sun, 19 Nov 2023 12:12: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 1r4lKz-0002TV-Rk for guix-patches@gnu.org; Sun, 19 Nov 2023 12:12:01 -0500 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 1r4lKz-0000KN-Jb for guix-patches@gnu.org; Sun, 19 Nov 2023 12:12:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r4lL0-00040n-F4 for guix-patches@gnu.org; Sun, 19 Nov 2023 12:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67283] [PATCH] guix: guile: Add #:substitutable? argument to build system. Resent-From: Skyler Ferris Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Nov 2023 17:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67283 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67283@debbugs.gnu.org Cc: Skyler Ferris X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170041386415354 (code B ref -1); Sun, 19 Nov 2023 17:12:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2023 17:11:04 +0000 Received: from localhost ([127.0.0.1]:52008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4lK4-0003za-5L for submit@debbugs.gnu.org; Sun, 19 Nov 2023 12:11:04 -0500 Received: from lists.gnu.org ([2001:470:142::17]:60424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4lJz-0003yz-KW for submit@debbugs.gnu.org; Sun, 19 Nov 2023 12:11:03 -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 1r4lJq-0002Hp-NA for guix-patches@gnu.org; Sun, 19 Nov 2023 12:10:50 -0500 Received: from c-24-143-119-132.customer.broadstripe.net ([24.143.119.132] helo=localhost) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r4lJo-0006Qb-Pg for guix-patches@gnu.org; Sun, 19 Nov 2023 12:10:50 -0500 Received: from [127.0.0.1] (helo=localhost.localdomain) by localhost with esmtp (Exim 4.96.1) (envelope-from ) id 1r4lJl-0005ga-0a; Sun, 19 Nov 2023 09:10:45 -0800 Date: Sun, 19 Nov 2023 09:10:36 -0800 Message-ID: <5b4d8b66adf880e9b7087324f34982dc5360f4a8.1700413827.git.skyvine@protonmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: softfail client-ip=24.143.119.132; envelope-from=skyvine@protonmail.com; helo=localhost X-Spam_score_int: 36 X-Spam_score: 3.6 X-Spam_bar: +++ X-Spam_report: (3.6 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001, FSL_HELO_NON_FQDN_1=0.001, HELO_LOCALHOST=3.828, KHOP_HELO_FCRDNS=0.001, RDNS_DYNAMIC=0.982, SPF_SOFTFAIL=0.665, SPOOFED_FREEMAIL=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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: Skyler Ferris X-ACL-Warn: , Skyler Ferris via Guix-patches X-Patchwork-Original-From: Skyler Ferris via Guix-patches via From: Skyler Ferris 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 is implemented the same as in gnu-build-system. * guix/build-system/guile.scm (guile-build, guile-cross-build): Add #:substitutable? argument Change-Id: I04babb81ff1f322833f7ff22cd7580c048b26102 --- guix/build-system/guile.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) base-commit: cd82ddd15c28b4f4690255b11a1ce6dcac7c166d prerequisite-patch-id: d25067ea4ec0e23744f2dca853c7e9f7b9ab4a9d diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index 1bd292e267..bd3bb1c870 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -88,7 +88,8 @@ (define* (guile-build name inputs (compile-flags %compile-flags) (imported-modules %guile-build-system-modules) (modules '((guix build guile-build-system) - (guix build utils)))) + (guix build utils))) + (substitutable? #t)) "Build SOURCE using Guile taken from the native inputs, and with INPUTS." (define builder (with-imported-modules imported-modules @@ -114,6 +115,7 @@ (define* (guile-build name inputs #:system system #:target #f #:graft? #f + #:substitutable? substitutable? #:guile-for-build guile))) (define* (guile-cross-build name @@ -133,7 +135,8 @@ (define* (guile-cross-build name (compile-flags %compile-flags) (imported-modules %guile-build-system-modules) (modules '((guix build guile-build-system) - (guix build utils)))) + (guix build utils))) + (substitutable? #t)) (define builder (with-imported-modules imported-modules #~(begin @@ -173,6 +176,7 @@ (define* (guile-cross-build name #:system system #:target target #:graft? #f + #:substitutable? substitutable? #:guile-for-build guile))) (define guile-build-system