From patchwork Sun May 8 20:07:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 39161 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 A64C727BBE9; Sun, 8 May 2022 21:29:52 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 38CA227BBEA for ; Sun, 8 May 2022 21:29:52 +0100 (BST) Received: from localhost ([::1]:32830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnnXL-0002o1-CI for patchwork@mira.cbaines.net; Sun, 08 May 2022 16:29:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnnF9-0005XR-Nk for guix-patches@gnu.org; Sun, 08 May 2022 16:11:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33162) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnnF8-0000Pm-5O for guix-patches@gnu.org; Sun, 08 May 2022 16:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnnF8-0002PZ-1d for guix-patches@gnu.org; Sun, 08 May 2022 16:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55248] [PATCH v2 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: Sun, 08 May 2022 20:11:01 +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.16520406069187 (code B ref 55248); Sun, 08 May 2022 20:11:01 +0000 Received: (at 55248) by debbugs.gnu.org; 8 May 2022 20:10:06 +0000 Received: from localhost ([127.0.0.1]:55291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnnEE-0002O0-5l for submit@debbugs.gnu.org; Sun, 08 May 2022 16:10:06 -0400 Received: from mail-ua1-f41.google.com ([209.85.222.41]:42582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnnE3-0002MJ-UE for 55248@debbugs.gnu.org; Sun, 08 May 2022 16:10:04 -0400 Received: by mail-ua1-f41.google.com with SMTP id ay15so4713224uab.9 for <55248@debbugs.gnu.org>; Sun, 08 May 2022 13:09:55 -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=dXPZyh0U/1OJ2Z5MXkQJYYZO6/8lk0CBzijww7EAovQs7tpdM3jlYsyZETDuS3HiJ5 zHu0T9K3KCLMPkC2sH6JwRcN9iarX+WyNX9zC2AFRD1QI/46uQIsqY4xjND1lzy9KIVp GQRUqpuYojC2SQ6DPAFb4x083GLVswIqssyIQzr3iZ9SZeTeaf7jKG+MomdSsWQD3zcB Jx+dtVxqbYsKtJtYKRN7ypOizg1KmoJvfj2EvbbJBqd2YD7DfxMXFNrxqKZLjzbD2FcE gd3U3jDxpFgP3dVSuaz2eCrZO9l1FHwwSc079eKAM0Jt8WZ2P5liKgVGsaDcLNZ8xR89 cBaA== 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=g01auw0PjroOvsZYW0ynHnoZK1El3GRQQxBH9n/1ETT1SK9X9PnGz59ecOLIyNjD+a VdLdTjRlq+8CR/O6rVaLdfmFToUJHmTMnbdToqSeud/IXENj+9tR5pPxevYPyggokHOR oKqjoTEKKOcXl1unJtg495UC/EIUtn7ajKzi1a4O91nIQKvntuIAFmRU6UCJMTteRoi7 ipA62Hud9yji2Yq3EwHBE3D4M9EzsXY3I68aNc0UGjQntls7oPfn0aevmIBYEBni0Hs1 iCe6O1h/M+m6MW7cNQsxNFeeMUyXQfMG4P+OE0AskHPSDLmXyH6NJxtBjPrcAo/w+dyp dpKw== X-Gm-Message-State: AOAM532J155qBa9bY9N3+3Nay9canjnZJz3ck+fsyHu3AR32wsvTZ9/2 Y7v9DtDplCzsj+BGvmNdQc2Q6evYtMxjgX68 X-Google-Smtp-Source: ABdhPJxw+Bu4so/ua5v7I5mCZnCSVLqYXb9dkJwfT3mcVy4+UPIOLea1MfhtGpKDU6y+ZtajROlgLg== X-Received: by 2002:a9f:3272:0:b0:359:eded:9c7e with SMTP id y47-20020a9f3272000000b00359eded9c7emr6746459uad.35.1652040590467; Sun, 08 May 2022 13:09:50 -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 t23-20020ab02797000000b00364e6da2ea5sm1323441uap.18.2022.05.08.13.09.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 May 2022 13:09:50 -0700 (PDT) From: Philip McGrath Date: Sun, 8 May 2022 16:07:52 -0400 Message-Id: <930d660fe1deaef1210ec6a04cec9e9aa66a150d.1652039837.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 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))