From patchwork Thu Feb 17 20:50:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37301 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 712DD27BBEB; Thu, 17 Feb 2022 20:54:22 +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.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 D952B27BBE9 for ; Thu, 17 Feb 2022 20:54:21 +0000 (GMT) Received: from localhost ([::1]:37338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nKnnA-0007ql-VD for patchwork@mira.cbaines.net; Thu, 17 Feb 2022 15:54:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nKnlx-0006pm-CN for guix-patches@gnu.org; Thu, 17 Feb 2022 15:53:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58913) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nKnlx-0001dt-24 for guix-patches@gnu.org; Thu, 17 Feb 2022 15:53:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nKnlx-0003aZ-1o for guix-patches@gnu.org; Thu, 17 Feb 2022 15:53:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v2 14/15] gnu: chez-and-racket-bootstrap: Add 'chez-scheme-for-system'. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Feb 2022 20:53:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53878@debbugs.gnu.org Cc: Philip McGrath , zimoun , Ludovic =?utf-8?q?Court=C3=A8s?= , Liliana Marie Prikler , Attila Lendvai , Malte Gerdes Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164513115713686 (code B ref 53878); Thu, 17 Feb 2022 20:53:05 +0000 Received: (at 53878) by debbugs.gnu.org; 17 Feb 2022 20:52:37 +0000 Received: from localhost ([127.0.0.1]:52800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nKnlU-0003Ya-Iv for submit@debbugs.gnu.org; Thu, 17 Feb 2022 15:52:37 -0500 Received: from mail-vs1-f53.google.com ([209.85.217.53]:35428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nKnlO-0003YA-F9 for 53878@debbugs.gnu.org; Thu, 17 Feb 2022 15:52:30 -0500 Received: by mail-vs1-f53.google.com with SMTP id q9so2246896vsg.2 for <53878@debbugs.gnu.org>; Thu, 17 Feb 2022 12:52:30 -0800 (PST) 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=QbK5LZXu0V4UjXnpEDfyzgsdVLZskkGk0jXCYGbYDQY=; b=Nd2wyLV/cNsuDppI0TGh4W1VvNjx4P9oxbnIjl+jfnZKhLbrCX7sUIMt31JAppdi6g WOthPL1lqx1DBUq9fNklr3btklkV4IxtUV0Ol45uHvwmVd67L/cIvWbFiffjxrWCEGl8 JaR1yo+5vj5/gZ2CnSZf7TnQa2yHT4JOS0jgh5u2AbUf/xl4ecbjfAc25DHYjW7ykWI9 4EXJsBqjZsi81dEUPxfsHILNx2srweg+b6q5B5us9M0zc+Q9AFZbG0f2yXcKz3dW/MI/ RvthTBr3P7j6/L22K2lZTiOGVW5sMSXR3m1ZFVlrAeRn6zaofK53iiOqrmzJ9H6iF+Qw JDfA== 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=QbK5LZXu0V4UjXnpEDfyzgsdVLZskkGk0jXCYGbYDQY=; b=ZJi/8711pPTpvMchdWLaXauXkl4vdVdlEsO1ZL8e4dZCgXpfKnis1RnOQMwoWqjzQX S4bE2NTgTDz+AC0QvxEqkOAyrBs0cuJzn1LqHBdd2kM5uTyPo+uP9FeNVIAbR9UZ6M3P atDlAI/bTSlHHVH1oc1ubQyv7Fc7MliJhVKb8rJbDvm+RoP8mBVrspjw6cdb5ufc2tWR Rs0ZR06KY5uWcriPrPevpLM4paBnp/WfLVeje76DN6TA7y71Y+miZPGR83zhgkkbV9aw 7r+NHVHuF1FPXAsjpnxae9L/5Lsud5tv+Ouxm6CMdjSidGCBkh9sjkfSPgX/ONs087rY fSrA== X-Gm-Message-State: AOAM530AX9pg0AF5TXi33bZ8BeTin7oyFkjxiOXPr59TjebkBC8kyzm5 HfCIyIFvhyyBZcDTPcOiiUmcMOJegNEVyWvqHAs= X-Google-Smtp-Source: ABdhPJyC9d4xkwc+GAw0kkpfnoELE/ZsF5qMz6hJstF/an3gcquuaVOahLMwc1oG86GHQgbzqYe/tA== X-Received: by 2002:a05:6102:ed3:b0:31b:aaa5:48d3 with SMTP id m19-20020a0561020ed300b0031baaa548d3mr2069695vst.17.1645131144883; Thu, 17 Feb 2022 12:52:24 -0800 (PST) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id z6sm2302059vsk.15.2022.02.17.12.52.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 17 Feb 2022 12:52:24 -0800 (PST) From: Philip McGrath Date: Thu, 17 Feb 2022 15:50:47 -0500 Message-Id: <20220217205048.967383-15-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220217205048.967383-1-philip@philipmcgrath.com> References: <97f8916ae5bd8d8459bdfd507864f2f55cc217a1.camel@ist.tugraz.at> <20220217205048.967383-1-philip@philipmcgrath.com> 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 * gnu/packages/chez-and-racket-bootstrap.scm (chez-scheme-for-system): New procedure. * gnu/packages/loko.scm (loko-scheme): Use 'chez-scheme-for-system'. * gnu/packages/emacs-xyz.scm (emacs-geiser-chez): Likewise * gnu/packages/chez.scm (chez-srfi): (chez-web): (chez-sockets): (chez-matchable): (chez-irregex): (chez-fmt): (chez-mit): (chez-scmutils): Likewise. --- gnu/packages/chez-and-racket-bootstrap.scm | 14 +++++++++++++- gnu/packages/chez.scm | 16 ++++++++-------- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/loko.scm | 2 +- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/gnu/packages/chez-and-racket-bootstrap.scm b/gnu/packages/chez-and-racket-bootstrap.scm index aa0eab4646..876c963293 100644 --- a/gnu/packages/chez-and-racket-bootstrap.scm +++ b/gnu/packages/chez-and-racket-bootstrap.scm @@ -45,7 +45,8 @@ (define-module (gnu packages chez-and-racket-bootstrap) #:use-module (gnu packages tex) #:use-module (gnu packages xorg) #:use-module ((guix licenses) - #:prefix license:)) + #:prefix license:) + #:export (chez-scheme-for-system)) ;; Commentary: ;; @@ -197,6 +198,17 @@ (define-module (gnu packages chez-and-racket-bootstrap) ;; ;; Code: +(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 (and (nix-system->chez-machine system) + (not (and=> (chez-upstream-features-for-system system) + (cut memq 'threads <>)))) + chez-scheme-for-racket + chez-scheme)) + (define (chez-machine->nonthreaded machine) "Given a string MACHINE naming a Chez Scheme machine type, returns a string naming the nonthreaded machine type for the same architecture and OS as diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index be251798c3..d5007e0cfd 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -74,7 +74,7 @@ (define-public chez-srfi (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - (list chez-scheme)) + (list (chez-scheme-for-system))) (arguments (list #:make-flags (chez-make-flags name version) #:test-target "test" @@ -105,7 +105,7 @@ (define-public chez-web (base32 "1dq25qygyncbfq4kwwqqgyyakfqjwhp5q23vrf3bff1p66nyfl3b")))) (build-system gnu-build-system) (native-inputs - (list chez-scheme + (list (chez-scheme-for-system) ghostscript ;; FIXME: This package fails to build with the error: ;; mktexpk: don't know how to create bitmap font for bchr8r @@ -170,7 +170,7 @@ (define-public chez-sockets (base32 "1n5fbwwz51fdzvjackgmnsgh363g9inyxv7kmzi0469cwavwcx5m")))) (build-system gnu-build-system) (native-inputs - (list chez-scheme + (list (chez-scheme-for-system) chez-web (texlive-updmap.cfg (list texlive-pdftex)))) (arguments @@ -256,7 +256,7 @@ (define-public chez-matchable (inputs (list chez-srfi)) ; for tests (native-inputs - (list chez-scheme)) + (list (chez-scheme-for-system))) (arguments (list #:make-flags (chez-make-flags name version) #:test-target "test" @@ -288,7 +288,7 @@ (define-public chez-irregex (propagated-inputs (list chez-srfi)) ; for irregex-utils (native-inputs - (list chez-scheme)) + (list (chez-scheme-for-system))) (arguments (list #:make-flags (chez-make-flags name version) #:test-target "test" @@ -319,7 +319,7 @@ (define-public chez-fmt (propagated-inputs (list chez-srfi)) ; for irregex-utils (native-inputs - (list chez-scheme)) + (list (chez-scheme-for-system))) (arguments (list #:make-flags (chez-make-flags name version) #:test-target "chez-check" @@ -382,7 +382,7 @@ (define string->uninterned-symbol (inputs (list chez-srfi)) ; for tests (native-inputs - (list chez-scheme)) + (list (chez-scheme-for-system))) (arguments (list #:make-flags (chez-make-flags name version) #:test-target "test" @@ -413,7 +413,7 @@ (define-public chez-scmutils (inputs (list chez-srfi)) ; for tests (native-inputs - (list chez-scheme)) + (list (chez-scheme-for-system))) (propagated-inputs (list chez-mit chez-srfi)) (arguments diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 56697858e6..55f55a2f32 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -451,7 +451,7 @@ (define-public emacs-geiser-chez (string-append "(eval-after-load 'geiser-impl '" all ")")))))))) (inputs - (list chez-scheme)) + (list (chez-scheme-for-system))) (propagated-inputs (list emacs-geiser)) (home-page "https://nongnu.org/geiser/") diff --git a/gnu/packages/loko.scm b/gnu/packages/loko.scm index 74a649b8a1..a7ab12a0c4 100644 --- a/gnu/packages/loko.scm +++ b/gnu/packages/loko.scm @@ -71,7 +71,7 @@ (define-public loko-scheme #t))))) (native-inputs `(("akku" ,akku) - ("chez-scheme" ,chez-scheme) + ("chez-scheme" ,(chez-scheme-for-system)) ("struct" ,guile-struct-pack) ("laesare" ,guile-laesare) ("pfds" ,guile-pfds)