From patchwork Mon May 9 06:02:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 39178 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 2FC4127BBEA; Mon, 9 May 2022 07:07:02 +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 E744327BBE9 for ; Mon, 9 May 2022 07:07:01 +0100 (BST) Received: from localhost ([::1]:43326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnwXt-00027Z-0n for patchwork@mira.cbaines.net; Mon, 09 May 2022 02:07:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnwW0-0001h8-Oo for guix-patches@gnu.org; Mon, 09 May 2022 02:05:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnwW0-0004o6-2W for guix-patches@gnu.org; Mon, 09 May 2022 02:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnwVz-0000xU-U6 for guix-patches@gnu.org; Mon, 09 May 2022 02:05:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55248] [PATCH v3 9/9] gnu: chez-scheme-for-system: Adjust for bytecode backend. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 May 2022 06:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55248 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55248@debbugs.gnu.org Cc: Liliana Marie Prikler , Maxime Devos , Philip McGrath , Liliana Marie Prikler Received: via spool by 55248-submit@debbugs.gnu.org id=B55248.16520762513579 (code B ref 55248); Mon, 09 May 2022 06:05:03 +0000 Received: (at 55248) by debbugs.gnu.org; 9 May 2022 06:04:11 +0000 Received: from localhost ([127.0.0.1]:55720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnwV8-0000ve-UJ for submit@debbugs.gnu.org; Mon, 09 May 2022 02:04:11 -0400 Received: from mail-vk1-f181.google.com ([209.85.221.181]:41959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnwV7-0000uz-MP for 55248@debbugs.gnu.org; Mon, 09 May 2022 02:04:09 -0400 Received: by mail-vk1-f181.google.com with SMTP id y27so6409265vkl.8 for <55248@debbugs.gnu.org>; Sun, 08 May 2022 23:04:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sXAlWzX75Hlmhrp6qGDaKZes3YE2GAMM4FDqwjqZ+mw=; b=DAr97DAZFxKQ9sbiMh4wBnaBCrxoe2Zut8ZlOqSxV2145xfslSF/0m9csIMDYn/ID1 n4W5cztUqaK6mUm+tIFEAIFA2M2cGuJrzVCM21z4wUl5TUHGr96dcahLCnN3ItrLC3WB fLHJkNSZYTfE3mTOFFGkuIhetebhp9B4hAxtAZT4JaZ8LN0A8c38YfesUIhRWaIdPd7u PeQuG7jtl5kO6NNhMQ6lgJ/Tnx1IyuZF966tiLCoFLeMN9TVetNUVI5P9yDcfk5s9NGe hnl4fTlULIapmsu+1d8QMECy2mk1FPJeoVxiWgFX/5zukpU7MzfyxcD6M+GLDR4BX3gK wlHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sXAlWzX75Hlmhrp6qGDaKZes3YE2GAMM4FDqwjqZ+mw=; b=mX/4LLzSw9gZBS4dzPpnGNktMPR4LyLEPaYGQd8742ts3TypwhYRBmSFPL7YAKw/Z1 zBFcqoSkQMbhcSbA5dYRiDKmh+9lUraIph7fQJ49aFNfbk/0GJIxvpk1qJsCYFP8vlxA aqBat/U99IJHl9+9ViBRwmUCqTB4RTcV+ro3F/SPNYjhtXglBwLxKZ4OrfykJlO/rPyx UvSsRYfxWKpj5kGT3MYJ2btSNa3v9NqnRTjl8aPrcJBtDpVBpC7gq0ySM7QYeOzQp8WN 5GmWo0ixVGrzVI97yw4wOzq9osDaEejzJCj6rUrazYwepToBONBRlQ9oFZTyQda1Sc2U VbhQ== X-Gm-Message-State: AOAM530VkqvWRzHALwbyQsIVJFH2GtFG+yrkionTQU3Q+GC64P3itOWP T94SoL3Kd4a8tvkxuMfpgzpL7BeuhFsXZQvs X-Google-Smtp-Source: ABdhPJxsPPT80rxWbBtrqCIU8XuW/ArJygjLh7dR95AdV8ub6TdVVSZTiNDEG+Evu+2YFFc5S/hbWw== X-Received: by 2002:a05:6122:1354:b0:351:bed1:611d with SMTP id f20-20020a056122135400b00351bed1611dmr7550617vkp.26.1652076244313; Sun, 08 May 2022 23:04:04 -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 c15-20020a056122030f00b0034e98f6f2d8sm1344756vko.55.2022.05.08.23.04.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 May 2022 23:04:04 -0700 (PDT) From: Philip McGrath Date: Mon, 9 May 2022 02:02:50 -0400 Message-Id: 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 Change 'chez-scheme-for-system' to return 'chez-scheme-for-racket' in two cases when it previously returned 'chez-scheme': 1. When 'chez-scheme' is not distributed with bootstrap bootfiles, since we can only cross-compile 'chez-scheme' for those systems; and 2. When neither 'chez-scheme' nor 'chez-scheme-for-racket' supports native code generation, since we will be able to use the ``portable bytecode'' backends of 'chez-scheme-for-racket' as soon as the issues in are resolved. * gnu/packages/chez.scm (chez-scheme-for-racket): Change condition. --- gnu/packages/chez.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index cae17580f8..7e6273f26a 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -69,14 +69,17 @@ (define-module (gnu packages chez) (define* (chez-scheme-for-system #:optional (system (or (%current-target-system) (%current-system)))) - "Return 'chez-scheme' unless only 'chez-scheme-for-racket' supports SYSTEM, -including support for native threads." - (if (or - ;; full support upstream - (and=> (chez-upstream-features-for-system system) - (cut memq 'threads <>)) - ;; no support anywhere - (not (nix-system->chez-machine system))) + "Return 'chez-scheme' if it fully supports SYSTEM, including support for +bootstrapping and native threads. Otherwise, return +'chez-scheme-for-racket'." + (if (and=> (chez-upstream-features-for-system system) + (lambda (features) + (every (cut memq <> features) + '(threads + ;; We can cross-compile for platforms without + ;; bootstrap bootfiles, but we can't self-host + ;; on them short of adding more binary seeds. + bootstrap-bootfiles)))) chez-scheme chez-scheme-for-racket))