From patchwork Thu Aug 11 11:08:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 41561 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 A95A327BBEC; Thu, 11 Aug 2022 12:11:23 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 F208227BBE9 for ; Thu, 11 Aug 2022 12:11:22 +0100 (BST) Received: from localhost ([::1]:58418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oM65y-0002Al-4O for patchwork@mira.cbaines.net; Thu, 11 Aug 2022 07:11:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oM64i-0000gH-VI for guix-patches@gnu.org; Thu, 11 Aug 2022 07:10:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33877) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oM64i-0005TK-Kv for guix-patches@gnu.org; Thu, 11 Aug 2022 07:10:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oM64i-0006Yu-GW for guix-patches@gnu.org; Thu, 11 Aug 2022 07:10:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57050] [PATCH v2 06/13] gnu: chez-scheme: Bootfiles should not be native inputs. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Aug 2022 11:10:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57050@debbugs.gnu.org Cc: Liliana Marie Prikler , Liliana Marie Prikler , Philip McGrath , Thiago Jung Bauermann Received: via spool by 57050-submit@debbugs.gnu.org id=B57050.166021615825053 (code B ref 57050); Thu, 11 Aug 2022 11:10:04 +0000 Received: (at 57050) by debbugs.gnu.org; 11 Aug 2022 11:09:18 +0000 Received: from localhost ([127.0.0.1]:51837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM63x-0006Vv-Oo for submit@debbugs.gnu.org; Thu, 11 Aug 2022 07:09:18 -0400 Received: from mail-qk1-f181.google.com ([209.85.222.181]:33409) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM63r-0006V7-KZ for 57050@debbugs.gnu.org; Thu, 11 Aug 2022 07:09:12 -0400 Received: by mail-qk1-f181.google.com with SMTP id f14so13213402qkm.0 for <57050@debbugs.gnu.org>; Thu, 11 Aug 2022 04:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=LPwoWqmZF2jIyAfy1wzTj3H5doONEMV1wg7yceTuFak=; b=cFFw+sYwQ/PtFfhpI+FjnFSDD1s2XGHq03fKiaSDxxnO1yvKEx3yXpK/Ab2eTafFBi XMRxml+4bsOl5KaMj9i1Iu6TJBQg/qaLppxXWBQb4oKRg718RRSzzNnHTLmD/oiIv7iL l+3ceUXrTi4cnSMEUXKljrXG/KVIp30C9CV8z1glmZsY4515+Ywag9BhC+Ytf/NZmf+a XrY3R/+C8Myn+yth4yhN9vqGFNW4DPw7iFx89Qowmi0N7Io1c/mHM8zYy5ybN9pDIbUt Ii6ot4CujIpkQ89R94B3vyovUjZdrjj46RcMiD+78t3waAAM2loljk/SZ+nJMZyOTwOW JKKA== 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:x-gm-message-state:from:to:cc; bh=LPwoWqmZF2jIyAfy1wzTj3H5doONEMV1wg7yceTuFak=; b=xa/NB4meC25SdSd+xvjrFFhSgGEO54MnJPLXj9AMhlPIZ0ZJDM9MaVgoFZ2UpMLQ8I h8TXdh2uBTP3JrJMoOeRQZt0gJjydqTUkLelBubmze+P95v67uMy0n7rBfa9Sp/gUtqu tfJ7e/XzJ2x+E0KaRfGHFpN24gDHnQuHMBwR3dqPN/oj8+I9l4W1aRRtunSxT7Om8sBe KHV3Q4Ucp0qf6JO6LSeq/TNzlAkjsPINagapFuCNU1dtVSP9HZhoKL67OcRDiEds9Zbt aw85yRooh/GS1vKDkU0WfRQgcFxFDJ2LzBcM+pZGAfUHQEDf1+74LZn3X7GLoSI4Rcj+ xiYw== X-Gm-Message-State: ACgBeo2HtllWnoYV2Co/xv8Nqw9V6jHXHCZ+8qtz0rV8pkP8eTSKnUyY PfTlhfHa5mQK4gLHUL5YQxGVbj8JIPOlEycB X-Google-Smtp-Source: AA6agR45g7WRdPdTmvDRHOfGhS4wYnhcjwSw/Y/oASqCpaG1D4Eeje7nYFM17RuQYpASm+8rCFqXJA== X-Received: by 2002:a05:620a:4416:b0:6b6:8101:be81 with SMTP id v22-20020a05620a441600b006b68101be81mr24610901qkp.414.1660216146101; Thu, 11 Aug 2022 04:09:06 -0700 (PDT) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id k5-20020a05620a414500b006b9526cfe6bsm1771731qko.80.2022.08.11.04.09.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 11 Aug 2022 04:09:05 -0700 (PDT) From: Philip McGrath Date: Thu, 11 Aug 2022 07:08:16 -0400 Message-Id: <760b29c0cb071c142a637e538233a661ad4a5c87.1660215295.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 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" X-getmail-retrieved-from-mailbox: Patches This makes a difference for cross-compilation. * gnu/packages/chez.scm (chez-scheme)[native-inputs]: Move 'chez-scheme-bootstrap-bootfiles' to ... [inputs]: ... this field. [arguments]<#:phases>: Update 'unpack-bootfiles' accordingly. (chez-scheme-for-racket)[native-inputs]: Move 'chez-scheme-for-racket-bootstrap-bootfiles' to ... [inputs]: ... this field. --- gnu/packages/chez.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index dde2c22ca5..294edca1a4 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -294,6 +294,7 @@ (define-public chez-scheme (build-system gnu-build-system) (inputs (list + chez-scheme-bootstrap-bootfiles `(,util-linux "lib") ;<-- libuuid zlib lz4 @@ -302,8 +303,7 @@ (define-public chez-scheme ;; for X11 clipboard support in expeditor: ;; https://github.com/cisco/ChezScheme/issues/9#issuecomment-222057232 libx11)) - (native-inputs (list chez-scheme-bootstrap-bootfiles - chez-nanopass-bootstrap + (native-inputs (list chez-nanopass-bootstrap stex-bootstrap)) (native-search-paths (list (search-path-specification @@ -342,7 +342,7 @@ (define-public chez-scheme (when (directory-exists? "boot") (delete-file-recursively "boot")) (copy-recursively - (search-input-directory (or native-inputs inputs) + (search-input-directory inputs "lib/chez-scheme-bootfiles") "boot"))) ;; NOTE: The custom Chez 'configure' script doesn't allow @@ -453,12 +453,12 @@ (define-public chez-scheme-for-racket (source #f) ; avoid problematic cycle with racket.scm (inputs (modify-inputs (package-inputs chez-scheme) - (delete "libx11" "util-linux:lib"))) + (delete "libx11" "util-linux:lib") + (replace "chez-scheme-bootstrap-bootfiles" + chez-scheme-for-racket-bootstrap-bootfiles))) (native-inputs (modify-inputs (package-native-inputs chez-scheme) - (append zuo) - (replace "chez-scheme-bootstrap-bootfiles" - chez-scheme-for-racket-bootstrap-bootfiles))) + (append zuo))) (arguments (substitute-keyword-arguments (package-arguments chez-scheme) ((#:out-of-source? _ #f)