From patchwork Sat Feb 26 13:02:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37477 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 3B05D27BBEA; Sat, 26 Feb 2022 13:06:43 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 9C85D27BBE9 for ; Sat, 26 Feb 2022 13:06:42 +0000 (GMT) Received: from localhost ([::1]:55702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNwmX-0002Ga-8h for patchwork@mira.cbaines.net; Sat, 26 Feb 2022 08:06:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNwl0-0000PW-ST for guix-patches@gnu.org; Sat, 26 Feb 2022 08:05:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNwl0-0003ZY-IW for guix-patches@gnu.org; Sat, 26 Feb 2022 08:05:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nNwl0-0005d2-Cq; Sat, 26 Feb 2022 08:05:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v5 21/22] gnu: chez: Add 'chez-scheme-for-system'. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 13:05:06 +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 , zimoun Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Maxime Devos , Attila Lendvai , Malte Gerdes , raingloom , philip@philipmcgrath.com X-Debbugs-Original-Xcc: philip@philipmcgrath.com Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164588068821540 (code B ref 53878); Sat, 26 Feb 2022 13:05:06 +0000 Received: (at 53878) by debbugs.gnu.org; 26 Feb 2022 13:04:48 +0000 Received: from localhost ([127.0.0.1]:54507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNwke-0005bA-VJ for submit@debbugs.gnu.org; Sat, 26 Feb 2022 08:04:48 -0500 Received: from mail-qv1-f46.google.com ([209.85.219.46]:39767) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNwkO-0005Zl-RM for 53878@debbugs.gnu.org; Sat, 26 Feb 2022 08:04:29 -0500 Received: by mail-qv1-f46.google.com with SMTP id a1so8844619qvl.6 for <53878@debbugs.gnu.org>; Sat, 26 Feb 2022 05:04:28 -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=/83ED+dFe8Q625+tAL6Gg/EtduG34MLZfJ5u1q+LKK8=; b=YnWg4NZhyhVr4b1bzcwjoyApq+DMj05oMGCgbaU7SoHSvuFscetPTxUFCmAAlHJBF4 o8/NoaSqWmS6t4lIFcD60YVEE2zgK693ujoYppPWYE8R2Szvdu3fTugFSlBY+7XjMc1u NXe+/K5t6B2B88gtz+KyZvuGdp4rNIwZGKf9/X5/7p09H3nnscDVKB9B9Rx6IXNLvdq0 vK1v9smm61d57lTq6vPLnO92//a7E1QoVdDS0ynr06i7CO5zMeOo4Lh1waTu6OtCnaNx gNYrs2wB2wJlcnmG+Td4tQIccbQUuhALseQZAgu99qIVj4+wZ5NfzUnW83Fg/m+mi6Cw o8Qw== 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=/83ED+dFe8Q625+tAL6Gg/EtduG34MLZfJ5u1q+LKK8=; b=q+JM4BsEjj1/LmcIiILuP8ES+1LUl+8DbEygPemYiDwDnKdVvJvkiJHPNji8yguwgw yybf618zxobJ1FcHXr+bam8YUGdNYeoQU+OMZXdAvn39IQr4ayCck+dw3docTa5c2M8g Ov9mXrspk3N5697ev3i8VrO7NzQpUPxJup4WGpHwYohPfFGHrGkoDkNXAvZxb0K9OkKm KHK6+1T71qHgy/KsCgjECfm8tkMF1HUoTvB0YHGMvgloNav1wUtbMQBtdJHjLt6jv4Sr CQ+9wkL1rVUQUHH4erOuYH1XGkGTc8z7hBf3wleEnY9mrvxNTz8AeHXpt2OxVy+dVyEA 44Dw== X-Gm-Message-State: AOAM531QKVhpsWQmNKNH64vrmbQV+myHGsoRWdxZ0ItgKc8K/dh4pIDp COyzVFHghrZg/1Fyd6soFlhc8GTGZocGFug5CVI= X-Google-Smtp-Source: ABdhPJymvH5qLpCDiqT2J6NExqixQ6XP209YHYN1LxYyUwlfk1m7V2eJstjs18TVt98lQ4gDTbDU7g== X-Received: by 2002:a0c:ec8a:0:b0:432:a04f:d225 with SMTP id u10-20020a0cec8a000000b00432a04fd225mr8276962qvo.83.1645880663447; Sat, 26 Feb 2022 05:04:23 -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 y16-20020a05622a121000b002deaa0af9e2sm3322929qtx.49.2022.02.26.05.04.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Feb 2022 05:04:23 -0800 (PST) From: Philip McGrath Date: Sat, 26 Feb 2022 08:02:53 -0500 Message-Id: <20220226130254.1301333-22-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220226130254.1301333-1-philip@philipmcgrath.com> References: <20220220060610.178131-1-philip@philipmcgrath.com> <20220226130254.1301333-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.scm (chez-scheme-for-system): New procedure. (chez-srfi, chez-web, chez-sockets, chez-matchable, chez-irregex, chez-fmt, chez-mit, chez-scmutils): Use 'chez-scheme-for-system'. * gnu/packages/loko.scm (loko-scheme): Likewise. * gnu/packages/emacs-xyz.scm (emacs-geiser-chez): Likewise --- gnu/packages/chez.scm | 33 ++++++++++++++++++++++++--------- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/loko.scm | 2 +- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index a6b5952819..c7505a14bd 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -47,7 +47,8 @@ (define-module (gnu packages chez) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) - #:export (nix-system->chez-machine + #:export (chez-scheme-for-system + nix-system->chez-machine chez-machine->nonthreaded chez-machine->threaded unpack-nanopass+stex)) @@ -67,6 +68,20 @@ (define-module (gnu packages chez) ;; ;; 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 (or + ;; full support upstream + (and=> (chez-upstream-features-for-system system) + (cut memq 'threads <>)) + ;; no support anywhere + (not (nix-system->chez-machine system))) + chez-scheme + chez-scheme-for-racket)) + (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 @@ -751,7 +766,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" @@ -782,7 +797,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 @@ -847,7 +862,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 @@ -933,7 +948,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" @@ -965,7 +980,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" @@ -996,7 +1011,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" @@ -1059,7 +1074,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" @@ -1090,7 +1105,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 ef98088100..df53df61c7 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 ef9312afe3..449c62f1f0 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)