From patchwork Sat Feb 19 06:42:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37355 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 7222527BBEA; Sat, 19 Feb 2022 07:17:51 +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 3899527BBE9 for ; Sat, 19 Feb 2022 07:17:51 +0000 (GMT) Received: from localhost ([::1]:56874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nLK06-0003kM-8U for patchwork@mira.cbaines.net; Sat, 19 Feb 2022 02:17:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLJUU-0007h9-RZ for guix-patches@gnu.org; Sat, 19 Feb 2022 01:45:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34638) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nLJUM-0008Oz-3m 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-0004qi-2Y for guix-patches@gnu.org; Sat, 19 Feb 2022 01:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v3 13/15] gnu: chez-mit: Support chez-scheme-for-racket. 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.164525305418527 (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]:56764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLJTZ-0004ok-H9 for submit@debbugs.gnu.org; Sat, 19 Feb 2022 01:44:13 -0500 Received: from mail-qk1-f179.google.com ([209.85.222.179]:37518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLJTJ-0004lg-LU for 53878@debbugs.gnu.org; Sat, 19 Feb 2022 01:43:58 -0500 Received: by mail-qk1-f179.google.com with SMTP id v5so7826355qkj.4 for <53878@debbugs.gnu.org>; Fri, 18 Feb 2022 22:43:57 -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=ZRi6asVXV+QTTkm+7nvM8RjAeYcMCR/ik7tKnX79K+k=; b=jwYX5kv20msMxa96tz28iUosJ2yI2nfPcKQAygm8bAfbfmHGVZ72IkTq2dpEfOHwZP 2+jUmvrYissaQ6rKMYrmYY/GUR1atn+jexeaR6MWs4teYW2IzSIKlUqy0cCW6IJMYmvj O3swAkfCj5BMd5/Z0RncDNt8n/c0x2pw3kS8Mp0nRTu1/bF9mNnndCVAEXqIPJskJFOc VLTHKNgJLyJ2DTev9HbFWtb3eYliQgx8iPynCOUHXiaTkBiKr+l5wyI4Hix7/4QqkSYQ 9I+55w1PLcYQUjDibrckpBSVSp7Vs205GX4kxZUimVfLMtXFw9TjYQUSqKvQsWiybD5F NJJA== 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=ZRi6asVXV+QTTkm+7nvM8RjAeYcMCR/ik7tKnX79K+k=; b=3S4rohbkRsfDfcmCM54NvErsfWx+qH+IQ5w6CtA1BGjdfBMAh04UH3id/MLytgZsXI uN0ygYqMszL9V60RoAs301LHYxvCG37aRk9L7Xc6h+sbWE+y66nip18EPVLrZPx7A0oF zaMyBQBqgO4jRgb5l6bdzJsAki0cE1gRzR1FbXPvLhKM6hGaLXBMHcSZM208ImvfYZu3 Wn+cZ9E6DHJ7ZXC+CxRLTv9tPbp7wxivSRSX3esTIbvE0QSU7ecrTfbyMnfZGX526GXO DR/jN/RsSBgeffCSMwXWLXpsTv97o3erQdSTHGtJcBu0dL7yXVcHMMU5hDPC0CZhBiwS mU/Q== X-Gm-Message-State: AOAM531PvdIf/IogrSbx5jbFlEGc60XTOMYcB+jTwMIZzzqGKOVWn/Qx ioYBXZ+RIEKOsct2C++exy53FkIjM4MwqGSMUxo= X-Google-Smtp-Source: ABdhPJwK7wYCDL1B1x/vmXED7WEkBPzv3umiXLjxkAKBuBoQM3yHxYdfr1g06mRh1CeBOZcs7YlWqQ== X-Received: by 2002:a05:620a:16a6:b0:62c:eb6d:172a with SMTP id s6-20020a05620a16a600b0062ceb6d172amr3005728qkj.147.1645253032109; Fri, 18 Feb 2022 22:43:52 -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 v12sm23434284qkl.74.2022.02.18.22.43.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 18 Feb 2022 22:43:51 -0800 (PST) From: Philip McGrath Date: Sat, 19 Feb 2022 01:42:26 -0500 Message-Id: <20220219064228.246917-14-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 Racket's variant of Chez Scheme defines 'string->uninterned-symbol', which conflicts with the definition from '(chez mit)'. See discussion at . * gnu/packages/chez.scm (chez-mit)[origin]: Add workaround for chez-scheme-for-racket. --- gnu/packages/chez.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 54bbee7923..be251798c3 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -355,7 +355,29 @@ (define-public chez-mit (commit (string-append "v" version)))) (sha256 (base32 "0c7i3b6i90xk96nmxn1pc9272a4yal4v40dm1a4ybdi87x53zkk0")) - (file-name (git-file-name name version)))) + (file-name (git-file-name name version)) + (snippet + ;; Workaround for chez-scheme-for-racket. + ;; See: https://github.com/racket/racket/issues/4151 + #~(begin + (use-modules (guix build utils)) + (substitute* "mit/core.sls" + (("[(]import ") + "(import (only (chezscheme) import)\n") + (("[(]define string->uninterned-symbol gensym[)]") + (format #f "~s" + '(begin + (import (only (chezscheme) + meta-cond + library-exports)) + (meta-cond + ((memq 'string->uninterned-symbol + (library-exports '(chezscheme))) + (import (only (chezscheme) + string->uninterned-symbol))) + (else + (define string->uninterned-symbol + gensym))))))))))) (build-system gnu-build-system) (inputs (list chez-srfi)) ; for tests