From patchwork Sat Feb 19 06:42:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37354 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 EBF3027BBEA; Sat, 19 Feb 2022 07:16:07 +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 5A02D27BBE9 for ; Sat, 19 Feb 2022 07:16:07 +0000 (GMT) Received: from localhost ([::1]:55762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nLJyQ-0002rc-5O for patchwork@mira.cbaines.net; Sat, 19 Feb 2022 02:16:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLJUU-0007hA-Rj for guix-patches@gnu.org; Sat, 19 Feb 2022 01:45:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34639) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nLJUM-0008P1-Hc for guix-patches@gnu.org; Sat, 19 Feb 2022 01:45:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nLJUM-0004qr-Gs for guix-patches@gnu.org; Sat, 19 Feb 2022 01:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v3 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: Sat, 19 Feb 2022 06:45:02 +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, Liliana Marie Prikler Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Attila Lendvai , Philip McGrath , Malte Gerdes , zimoun Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164525305418535 (code B ref 53878); Sat, 19 Feb 2022 06:45:02 +0000 Received: (at 53878) by debbugs.gnu.org; 19 Feb 2022 06:44:14 +0000 Received: from localhost ([127.0.0.1]:56766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLJTZ-0004om-Rg for submit@debbugs.gnu.org; Sat, 19 Feb 2022 01:44:14 -0500 Received: from mail-qv1-f41.google.com ([209.85.219.41]:38561) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLJTN-0004lv-QG for 53878@debbugs.gnu.org; Sat, 19 Feb 2022 01:44:02 -0500 Received: by mail-qv1-f41.google.com with SMTP id d3so19157802qvb.5 for <53878@debbugs.gnu.org>; Fri, 18 Feb 2022 22:44:01 -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=U/Dsi/M90+x4hlymBb7FfUjeUstWZIkx1NFHod/Zyhw=; b=iLgLim4BipWy4tRvynuPnVHakion7W4+lOs1ZCo30GjYGkf81gL2Uujn4eGiAEjHf1 YcubUy01DhpH6Uts0OeALmU/6qi2glU3ESTmYMKc7bK+AFDCgWE52lu0lKV9xYTwpADw 1GWKbQkgAuOiMP9YfuzXslqoBHhNXKKYa+2uqWspeA0LqcopddsdUHEp29F+5AHAmfOa PiX17EUOchol5ysN19h3v01wjOSKkIDnpCosA1kFVgwdVjkBMXk8khpvaOec0ISgoFKX bc/9XV3+iTysbp3g+QPljV0qIdJl2IpnyYKQvxkcIg/jqJkHfUiqg8k0F9r3XOAvsR1o FFAA== 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=U/Dsi/M90+x4hlymBb7FfUjeUstWZIkx1NFHod/Zyhw=; b=I2UXCyUZnuCl1wuBp5dcUUVMUT5CTsHpXnXzKy7J0+bYwkGZYWM4adkXmxC5aif0Cd Cy90qxYZqIh5i7NLjM4aVZ2MZzg8sbhiLlYFrJ4N0XwiUuhfYg8juA3w8TaT1BzGb6Kl y3M49N91wO8DnFgHOXUQqO4BaQpIslvOi/E/pbB+/7oXR1QXUTwJYnZaTweMgjiPnjGe 4YIF6ZqZezrpwMyR7DhaAjPEL5HX8ewVrNb3VFj6OSHf2RqQdhQ6nYIzIGRjfyLZmrgP 6cS5mmxKTkD6AFE4PPdgHV7BuQFiTLPacV7N7HmJxaZHILTLhGmkclXohCcMJlqlLyiQ CTiw== X-Gm-Message-State: AOAM533pebirYhKnsz6T/kxjplBSI9wXIwn8VUR5wqUHZaVJ7UoSjop2 RG65UwfroLhYLgpeP9C86P1F4BznJKHEklWs2BU= X-Google-Smtp-Source: ABdhPJy9EQB4XmY8y0Ibhz1vtRaLqM13J/bwZkgd2rJtj8+bWBYlN3PacesgMGMmct3HbbNMcUGIRg== X-Received: by 2002:a05:6214:7ef:b0:42c:51a6:71e2 with SMTP id bp15-20020a05621407ef00b0042c51a671e2mr8539918qvb.116.1645253036271; Fri, 18 Feb 2022 22:43:56 -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 h1sm24083380qkn.71.2022.02.18.22.43.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 18 Feb 2022 22:43:56 -0800 (PST) From: Philip McGrath Date: Sat, 19 Feb 2022 01:42:27 -0500 Message-Id: <20220219064228.246917-15-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220219064228.246917-1-philip@philipmcgrath.com> References: <20220208151316.1897345-1-philip@philipmcgrath.com> <20220219064228.246917-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 458645f037..51032fc68f 100644 --- a/gnu/packages/chez-and-racket-bootstrap.scm +++ b/gnu/packages/chez-and-racket-bootstrap.scm @@ -46,7 +46,8 @@ (define-module (gnu packages chez-and-racket-bootstrap) #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) - #:export (%racket-version + #:export (chez-scheme-for-system + %racket-version %racket-origin)) ;; Commentary: @@ -199,6 +200,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 cb7d4425af..24f5b1e9c1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -450,7 +450,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)