From debbugs-submit-bounces@debbugs.gnu.org Sat May 25 23:17:44 2024 Received: (at submit) by debbugs.gnu.org; 26 May 2024 03:17:44 +0000 Received: from localhost ([127.0.0.1]:38096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sB4OG-0008GT-1u for submit@debbugs.gnu.org; Sat, 25 May 2024 23:17:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:43754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sB4OD-0008GJ-4Q for submit@debbugs.gnu.org; Sat, 25 May 2024 23:17:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sB4Lx-0004yo-9g for guix-patches@gnu.org; Sat, 25 May 2024 23:15:21 -0400 Received: from wfout1-smtp.messagingengine.com ([64.147.123.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sB4Lp-0000Mg-Oz for guix-patches@gnu.org; Sat, 25 May 2024 23:15:21 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.west.internal (Postfix) with ESMTP id 3048C1C000C8 for ; Sat, 25 May 2024 23:15:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 25 May 2024 23:15:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:content-transfer-encoding:content-type :date:date:from:from:in-reply-to:message-id:mime-version :reply-to:subject:subject:to:to; s=fm1; t=1716693309; x= 1716779709; bh=NUwyNCqE/k6QHXPWFz6640VcqZX25PwV21thP/zAV58=; b=p BaZ1SkMdG7yP/GXHvELoFLC6+Dkkxv8k/4psq/oBXMptB6enmN+AD+fSB0FFhPrJ gtXOzOxBAGVPlwDI/zgVxwpbYRQTYg7ZOjrE0xpbui10GI/XAfHYvc/QbnE8Mx8Z TlZbf1nqpeb0bMtcsBqjeHXfgz0jqwH83zGgVlIQUumotS92O/QJT8NDPiKu7QYE PfnvHhyIHcBVVcOmHAAB8OBi8XHMM3ER379COD/QIuOyzhguTAvPmeVH/xjCODkD OIkqwxkxkkAc4S187QJlh6uhjKe0unEL46ZfRdxc+YG3tXeM0iAo2ItP6QVoFYZ1 +z1y2TFuabaCX99l39Nzg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1716693309; x=1716779709; bh=NUwyNCqE/k6QHXPWFz6640VcqZX2 5PwV21thP/zAV58=; b=EW2mVCRiYVAMSz0a9DC4Bhpxn+acKHROe5VQSBUn2iQo DcX90t6wJfPP8n6bWuQjstVwoNEL7k84Tha1iZMN82hxXre/+G/9c7vLJEv77jmw U7O+oinh9PkwubOFQoP2oAm/nJ0YFPY/OnLhzj6RoWDiM0/0vqhNcuphhNNt9Dxw yQ5zmy6P4HhZ4FRcM6+bpNZTA5JKxnzPHCDS2odRILbPwTjtf7/ri1U+CtkeHn3w 7VqGSOyrCKjAbww6Xq1or0tsWqe6M4b6r8u0vgFCQle8IFdgP57CJmLzBAvJYcew W+GF62U0yjwPErqkcmao8FNj/2BkaCp0zBiuuWJYtg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdejuddgieejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheprfhhihhlihhpucfotgfirhgrthhhuceophhhihhlihhpsehphhhi lhhiphhmtghgrhgrthhhrdgtohhmqeenucggtffrrghtthgvrhhnpefgleekieeiffehff ffhefhheethfduhefhueejvdeiieffheefffeftdeiudekieenucevlhhushhtvghrufhi iigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmh gtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 25 May 2024 23:15:09 -0400 (EDT) From: Philip McGrath To: guix-patches@gnu.org Subject: [PATCH 0/3] gnu: racket: Update to 8.13. Date: Sat, 25 May 2024 23:15:06 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-CC: Philip McGrath X-Debbugs-Cc: Philip McGrath Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.144; envelope-from=philip@philipmcgrath.com; helo=wfout1-smtp.messagingengine.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Hi, This is the update for the Racket 8.13 release. The first patch updates Zuo, and the final patch backports a fix for upstream Chez Scheme to let us run the test suite. Thanks, Philip Philip McGrath (3): gnu: zuo: Update to 1.10. gnu: racket: Update to 8.13. gnu: chez-scheme: Backport test fix. gnu/local.mk | 2 +- gnu/packages/chez.scm | 5 +- .../patches/chez-scheme-backport-signal.patch | 87 ++++ .../racket-backport-8.12-chez-configure.patch | 423 ------------------ gnu/packages/racket.scm | 49 +- 5 files changed, 114 insertions(+), 452 deletions(-) create mode 100644 gnu/packages/patches/chez-scheme-backport-signal.patch delete mode 100644 gnu/packages/patches/racket-backport-8.12-chez-configure.patch base-commit: 94c8cec99969fe9f65777637fde1f05e1c576a3f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat May 25 23:18:59 2024 Received: (at submit) by debbugs.gnu.org; 26 May 2024 03:18:59 +0000 Received: from localhost ([127.0.0.1]:38104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sB4PT-0008In-GA for submit@debbugs.gnu.org; Sat, 25 May 2024 23:18:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:41996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sB4PR-0008If-Qp for submit@debbugs.gnu.org; Sat, 25 May 2024 23:18:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sB4PI-0006GV-R0 for guix-patches@gnu.org; Sat, 25 May 2024 23:18:48 -0400 Received: from wfhigh4-smtp.messagingengine.com ([64.147.123.155]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sB4PH-0000sl-5C for guix-patches@gnu.org; Sat, 25 May 2024 23:18:48 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 94F4118000C2 for ; Sat, 25 May 2024 23:18:45 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sat, 25 May 2024 23:18:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:content-transfer-encoding:content-type :date:date:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:subject:subject:to:to; s=fm1; t=1716693525; x=1716779925; bh=I9jz65PjzidW+DP2g2dDpdZ8l7cWonQl fkYcDC1WO28=; b=ZdXQzS4cH7kryJ7jhRCzgAPC7rMuwcXdy3i1jvczyoHcbJK2 7Z2ONY3KZyJiT6wNBZv1RWavxTS8We8kEJKEBBmSfEAhENfypipmWmt42JQFkqgc WzMytIVR0ss/+02FPu5GdbKF2S7RAvtJC0v0b5qqcvIXnM5BmByvcBJBs3s07opX Hqnhhw81BEwxOguwQzn2Xn/+H6YoTQSRwyoqD76M4Anl6TRNkeUOzk2KF1zJxIFH eyVWZ2Bdw4ez9BugJnb9gkbVv6Q/BKu9/otyj53lUTpctJDe/ReYi1yEqSjcZZto cU4u+xT2S3pQsvCPHj/dXc+MUTxa4MFig9+Z+Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1716693525; x=1716779925; bh=I9jz65PjzidW+ DP2g2dDpdZ8l7cWonQlfkYcDC1WO28=; b=TILe8NCEIf9q+MhUZgww5K30PK1mN ZVLBMzIElVxZJfXb9wAZRe3gWtfW2a/mRFyLBevQD2QzaN6Ym8ng37U9A+gyTrgm 62gBmNsCn7zeFYQKUPJKW5r7D6Pnx5TeyVk+SoiGS4K18+UCRG5PMMWf8ytYd72x TIV2KxwhuDzxuFI+TMtNV1BpklJDkIxRHuYPfGzrgCogfE7jq4ECnVb5k3PO7QZ7 il+yp3SCXOSqwMn07MwPMDkYCwaHvRkMqiP3mT5q6ANVpPrGBTlM5grye5Ypq8VF G2ZU4tuWOV/bmFjmnjIkBaQeWnAk+m1Fnmre/LS8M4yu/Ui+LfW3b/gJQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdejuddgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheprfhhihhlihhpucfotgfirhgrthhhuceophhhihhlihhpsehp hhhilhhiphhmtghgrhgrthhhrdgtohhmqeenucggtffrrghtthgvrhhnpedukefhveeile fhkeevgeeghfdvgfevvdefgeeiudfgveevffejteethfelgffftdenucffohhmrghinhep ghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 25 May 2024 23:18:44 -0400 (EDT) From: Philip McGrath To: guix-patches@gnu.org Subject: [PATCH 1/3] gnu: zuo: Update to 1.10. Date: Sat, 25 May 2024 23:18:41 -0400 Message-ID: <282a223ded8027a56830130cbe182c440d7073a8.1716692931.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-CC: Philip McGrath X-Debbugs-Cc: Philip McGrath Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.155; envelope-from=philip@philipmcgrath.com; helo=wfhigh4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/racket.scm (zuo): Update to 1.10. Change-Id: I082129143b77d34236e32e5cd4f4aac3275d4bca --- gnu/packages/racket.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 2b20353159..ab9687ca88 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -243,7 +243,7 @@ (define %racket-origin (define-public zuo (package (name "zuo") - (version "1.9") ; defined in racket/src/zuo/zuo.c or the following + (version "1.10") ; defined in racket/src/zuo/zuo.c or the following #;(displayln (~a (hash-ref (runtime-env) 'version) "." (hash-ref (runtime-env) 'minor-version))) (source (origin @@ -252,7 +252,7 @@ (define-public zuo (url "https://github.com/racket/zuo") (commit (string-append "v" version)))) (sha256 - (base32 "0zasir33nx1qi1ciz9dn6h8k39i443lr6apw5d1i6mjmhpzxmdhp")) + (base32 "007bjbhxbw3dq75klaa6f6ljhri2qxi43q6n74wyy50vr9yhx4s1")) (file-name (git-file-name name version)) (patches (search-patches "zuo-bin-sh.patch")))) (outputs '("out" "debug")) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat May 25 23:19:04 2024 Received: (at submit) by debbugs.gnu.org; 26 May 2024 03:19:04 +0000 Received: from localhost ([127.0.0.1]:38114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sB4PX-0008Jj-Re for submit@debbugs.gnu.org; Sat, 25 May 2024 23:19:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:52488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sB4PT-0008Ip-QU for submit@debbugs.gnu.org; Sat, 25 May 2024 23:19:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sB4PL-0006Gq-IL for guix-patches@gnu.org; Sat, 25 May 2024 23:18:51 -0400 Received: from wfout1-smtp.messagingengine.com ([64.147.123.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sB4PJ-0000uL-9i for guix-patches@gnu.org; Sat, 25 May 2024 23:18:51 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id 29A271C000D0 for ; Sat, 25 May 2024 23:18:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sat, 25 May 2024 23:18:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:content-transfer-encoding:content-type :date:date:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:subject:subject:to:to; s=fm1; t=1716693527; x=1716779927; bh=4HO8bYsQTpbrS1vsTrxrVwjcZyfq3sNM eAqc78Z1zxU=; b=MG0URkALRhNpjC2iQAeuiY+SqU/xYqb25yWGIsChuigcQ0v/ mKMM/S+LHR7TqNIJ+7kYHrHeFGPrf2m40d62vAHCkFN4K4fWgBMukRTR6iahIk3k OUyCTcZkPNfcrSzMhT1VmROxQ/JNt+X1diwQcA0n/s1skcznFZZPQqj1rnP2Yh9r TKyqwkoWVmwkJT6CcFu0UDurwSRmdvek8+bduecIgzn7bFZ0J2b35GJS1WUliBaT 9uLjojNYbBpqUKo3PVR/2Mi88iIHrWmXXKvV6Y07cEsedwy0dCcpu5jvnlRPWVfD Z7GJK9g4/9MLdMrXF0V6w3l+E34nm0sEqPpfdA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1716693527; x=1716779927; bh=4HO8bYsQTpbrS 1vsTrxrVwjcZyfq3sNMeAqc78Z1zxU=; b=JuJ3KyI7iO9fbSB9eXLsSXY+fjcVr /Ibn0KpUjIQ7wirsS1b42/d8MuOpu+8PuZoAgtxD4QhAFMer7ADs0hk8fnIl9J6i /0+Jd2NhZjcc02/T1/xXFZuvbd5I6Kw0c0Z4OrZlDJwCxsSB48AzcRaBZYnzUBIA 5Cz5G1t4cvxe2G8vd7s9xW46K+PDnbwvAZt6G3ujUtBy7H2tzvPUOiZ5Ex2PfWuj 7xcYnIjXsH1c5oakqPJRJ8Y/G4AXGnL3KAo1pBnuHnnUJWxMP8mmq4H560yYtoxS uXt+c8FOBsyVsNd5g1XqaTgHC0W7J1odo0Ji33E1ZKqMpjk3VYj0rbTJA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdejuddgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheprfhhihhlihhpucfotgfirhgrthhhuceophhhihhlihhpsehp hhhilhhiphhmtghgrhgrthhhrdgtohhmqeenucggtffrrghtthgvrhhnpedukefhveeile fhkeevgeeghfdvgfevvdefgeeiudfgveevffejteethfelgffftdenucffohhmrghinhep ghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 25 May 2024 23:18:47 -0400 (EDT) From: Philip McGrath To: guix-patches@gnu.org Subject: [PATCH 3/3] gnu: chez-scheme: Backport test fix. Date: Sat, 25 May 2024 23:18:43 -0400 Message-ID: <3610d2d5d8141d4be1dae8faa1b5ede61e2ff882.1716692931.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-CC: Philip McGrath X-Debbugs-Cc: Philip McGrath Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.144; envelope-from=philip@philipmcgrath.com; helo=wfout1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) The backported commit fixes crashes when signals are delivered to non-Scheme threads, including GC worker threads and threads created by foreign libraries. This appears to have been the cause of the intermittent test failures we have experienced. * gnu/packages/patches/chez-scheme-backport-signal.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/chez-scheme.scm (chez-scheme)[source]: Use it. (chez-scheme-for-racket, chez-scheme): Enable tests. Change-Id: Ifd87ca0d1707ef6ad067d883772a5b42803ead94 --- gnu/local.mk | 1 + gnu/packages/chez.scm | 3 +- .../patches/chez-scheme-backport-signal.patch | 87 +++++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/chez-scheme-backport-signal.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5136c92bcf..190e4bd27b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1026,6 +1026,7 @@ dist_patch_DATA = \ %D%/packages/patches/ccextractor-autoconf-tesseract.patch \ %D%/packages/patches/ccextractor-fix-ocr.patch \ %D%/packages/patches/chez-scheme-backport-configure.patch \ + %D%/packages/patches/chez-scheme-backport-signal.patch \ %D%/packages/patches/chez-scheme-bin-sh.patch \ %D%/packages/patches/circos-remove-findbin.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index dd98966c78..8c52bbb188 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -329,8 +329,6 @@ (define-public chez-scheme-for-racket (ice-9 match) (srfi srfi-34)) #:out-of-source? #t - ;; Intermittent failures: https://github.com/cisco/ChezScheme/issues/809 - #:tests? #f #:test-target "test" ; test-one test-some-fast test-some test test-more #:configure-flags #~`(,@(let* ((chez+version (strip-store-file-name #$output)) @@ -509,6 +507,7 @@ (define-public chez-scheme "1q66vafhiwk617z51qkm1v64r3bxqhhf5lzrmsa4l9d5yhvlyk09")) (file-name (git-file-name name version)) (patches (search-patches "chez-scheme-backport-configure.patch" + "chez-scheme-backport-signal.patch" "chez-scheme-bin-sh.patch")) (snippet #~(begin (use-modules (guix build utils)) diff --git a/gnu/packages/patches/chez-scheme-backport-signal.patch b/gnu/packages/patches/chez-scheme-backport-signal.patch new file mode 100644 index 0000000000..1fee32b167 --- /dev/null +++ b/gnu/packages/patches/chez-scheme-backport-signal.patch @@ -0,0 +1,87 @@ +From e416651d8b53fa2eca6edde764a9131d128cd166 Mon Sep 17 00:00:00 2001 +From: Matthew Flatt +Date: Sat, 2 Mar 2024 07:18:41 -0700 +Subject: [PATCH] constrain signal delivery to Scheme to the main thread (#813) + +The intent is to avoid crashes when a signal gets delimited to a +thread that might not even be a Scheme thread. Also, we don't try to +queue the event directly in the main thread's context, because then +we'd need more of a lock (while signal handling is otherwise an +implicit lock). + +(cherry picked from commit fc081fc447a786dd53286e5d7314b7217631cb68) +--- + +Notes: + This should fix intermittent test failures experienced by Guix: + see . + + c/globals.h | 1 + + c/schsig.c | 10 ++++++++++ + c/thread.c | 1 + + csug/system.stex | 2 ++ + 4 files changed, 14 insertions(+) + +diff --git a/c/globals.h b/c/globals.h +index d2a08299..eb2965c5 100644 +--- a/c/globals.h ++++ b/c/globals.h +@@ -49,6 +49,7 @@ EXTERN int S_num_preserve_ownership_threads; + # ifdef IMPLICIT_ATOMIC_AS_EXPLICIT + EXTERN s_thread_mutex_t S_implicit_mutex; + # endif ++EXTERN s_thread_t S_main_thread_id; + #endif + + /* segment.c */ +diff --git a/c/schsig.c b/c/schsig.c +index a89ab62a..04677730 100644 +--- a/c/schsig.c ++++ b/c/schsig.c +@@ -666,6 +666,16 @@ ptr S_dequeue_scheme_signals(ptr tc) { + static void forward_signal_to_scheme(INT sig) { + ptr tc = get_thread_context(); + ++#ifdef PTHREADS ++ /* deliver signals to the main thread, only; depending ++ on the threads that are running, `tc` might even be NULL */ ++ if (tc != TO_PTR(&S_G.thread_context)) { ++ pthread_kill(S_main_thread_id, sig); ++ RESET_SIGNAL ++ return; ++ } ++#endif ++ + if (enqueue_scheme_signal(tc, sig)) { + SIGNALINTERRUPTPENDING(tc) = Strue; + SOMETHINGPENDING(tc) = Strue; +diff --git a/c/thread.c b/c/thread.c +index 9a341b22..f130f44d 100644 +--- a/c/thread.c ++++ b/c/thread.c +@@ -40,6 +40,7 @@ void S_thread_init(void) { + s_thread_cond_init(&S_terminated_cond); + S_alloc_mutex.owner = 0; + S_alloc_mutex.count = 0; ++ S_main_thread_id = s_thread_self(); + + # ifdef IMPLICIT_ATOMIC_AS_EXPLICIT + s_thread_mutex_init(&S_implicit_mutex); +diff --git a/csug/system.stex b/csug/system.stex +index d4f2bcbb..bb89f419 100644 +--- a/csug/system.stex ++++ b/csug/system.stex +@@ -547,6 +547,8 @@ After a signal handler for a given signal has been registered, receipt + of the specified signal results in a call to the handler. + The handler is passed the signal number, allowing the same handler to + be used for different signals while differentiating among them. ++In a threaded version of the system, signals are always delivered to ++the main thread. + + Signals handled in this fashion are treated like keyboard interrupts in + that the handler is not called immediately when the signal is delivered + +base-commit: 253230f7dfbb4fe777277d6bbf93f39f9567f086 +-- +2.41.0 + -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat May 25 23:19:05 2024 Received: (at submit) by debbugs.gnu.org; 26 May 2024 03:19:05 +0000 Received: from localhost ([127.0.0.1]:38116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sB4PY-0008Jl-Eb for submit@debbugs.gnu.org; Sat, 25 May 2024 23:19:05 -0400 Received: from lists.gnu.org ([209.51.188.17]:52502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sB4PU-0008Iv-5N for submit@debbugs.gnu.org; Sat, 25 May 2024 23:19:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sB4PL-0006Gv-WB for guix-patches@gnu.org; Sat, 25 May 2024 23:18:52 -0400 Received: from wfhigh4-smtp.messagingengine.com ([64.147.123.155]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sB4PI-0000ss-Uh for guix-patches@gnu.org; Sat, 25 May 2024 23:18:51 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.west.internal (Postfix) with ESMTP id E1DCC18000E4 for ; Sat, 25 May 2024 23:18:46 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 25 May 2024 23:18:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:content-transfer-encoding:content-type :date:date:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:subject:subject:to:to; s=fm1; t=1716693526; x=1716779926; bh=6IGzSNAtqxy9rVaWie3BNaxSCmdy2Y+d dcT50q6auvI=; b=teyzj8psGlkjaoPE2JNg/Wiru2u4KSRP0/LZGNpubAuBpa1m FuCh8gZXzt+dPmQvGGp6JWDf2W5tq3yi+AKcn53e2Rt6oswWoI38Mrt9JGQNHX6E HigplJVg4eTsDnXW/xtAa6RI0CVnyZE6azVNIq9P4LNIEZeKuBEWFGUMj/ktgcYq uTE+OFqcUu3mtxq/FJD8ros9zFAqa8dggriz1SO+5M7kv7c9Ca4vWFtoqtId4Au0 QW6YKaIjDhM0wErrb7QOQ9qQv2z1mxmAt+qyn74wylyLcWuDoAWlJDlmuNmaU4aB McM5haAo3q46XchVCjqLFuY1ounXZDFAQaEoYA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1716693526; x=1716779926; bh=6IGzSNAtqxy9r VaWie3BNaxSCmdy2Y+ddcT50q6auvI=; b=dTSYkX2wuCl/YbQKao4OmCqcfz3Mn LdBJC2tlumb2OeM6mkTJQ/wt3XWBp8CdmgueT1tWJqG8Of4Ves3cxyxEmXkTBTXl 0NRDJmIrXBeGbZNSWP+/XtWOk1ewnoUcEHz5c/z08AbvAE4LdU7o/VrhVJWO2SKy xeVpH1T4UnG9vXbSnJRsYYCJBmFM/NZnVnoy8ErFZwxqwHcLVqXnhEoOlCjbOnIN XjWap3V7+hGRhu6RMJSV8kk/z+TQXDxy1yVy2NkNrGqQdYCuc+nOwkflgAxjh6TP CgjYYK2NxIlJZ06wvHtlzFKXaRte9VYgVN8EhapYSxs6bVnEs3+Ld37gg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdejuddgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheprfhhihhlihhpucfotgfirhgrthhhuceophhhihhlihhpsehp hhhilhhiphhmtghgrhgrthhhrdgtohhmqeenucggtffrrghtthgvrhhnpedukefhveeile fhkeevgeeghfdvgfevvdefgeeiudfgveevffejteethfelgffftdenucffohhmrghinhep ghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 25 May 2024 23:18:46 -0400 (EDT) From: Philip McGrath To: guix-patches@gnu.org Subject: [PATCH 2/3] gnu: racket: Update to 8.13. Date: Sat, 25 May 2024 23:18:42 -0400 Message-ID: <059d9a24ed7df8e0d1b1105963d9f560140c8d10.1716692931.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-CC: Philip McGrath X-Debbugs-Cc: Philip McGrath Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.155; envelope-from=philip@philipmcgrath.com; helo=wfhigh4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/patches/racket-backport-8.12-chez-configure.patch: Delete obsolete patch. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/racket.scm (%racket-origin)[patches]: Likewise. * gnu/packages/chez.scm (chez-scheme-for-racket): Update to 10.0.1-pre-release.1. * gnu/packages/racket.scm (%racket-version): Update to 8.13. (racket)[inputs] : Update hashes. Change-Id: I2d7b6e79a5a4e775d9b918b39fb688b484bb9f93 --- gnu/local.mk | 1 - gnu/packages/chez.scm | 2 +- .../racket-backport-8.12-chez-configure.patch | 423 ------------------ gnu/packages/racket.scm | 45 +- 4 files changed, 23 insertions(+), 448 deletions(-) delete mode 100644 gnu/packages/patches/racket-backport-8.12-chez-configure.patch diff --git a/gnu/local.mk b/gnu/local.mk index 502e97ecd5..5136c92bcf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2009,7 +2009,6 @@ dist_patch_DATA = \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-chez-scheme-bin-sh.patch \ - %D%/packages/patches/racket-backport-8.12-chez-configure.patch \ %D%/packages/patches/racket-rktio-bin-sh.patch \ %D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/restartd-update-robust.patch \ diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index db582fa821..dd98966c78 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -297,7 +297,7 @@ (define-public chez-scheme-for-racket (name "chez-scheme-for-racket") ;; The version should match `(scheme-version-number #t)`. ;; See s/cmacros.ss c. line 360. - (version "9.9.9-pre-release.23") + (version "10.1.0-pre-release.1") (source #f) (build-system gnu-build-system) (inputs `(,@(if (nix-system->native-chez-machine-type) diff --git a/gnu/packages/patches/racket-backport-8.12-chez-configure.patch b/gnu/packages/patches/racket-backport-8.12-chez-configure.patch deleted file mode 100644 index 483948fec9..0000000000 --- a/gnu/packages/patches/racket-backport-8.12-chez-configure.patch +++ /dev/null @@ -1,423 +0,0 @@ -From 82157f5b3fb9f71ad7fc978c428d423d06a4a0df Mon Sep 17 00:00:00 2001 -From: Philip McGrath -Date: Wed, 28 Feb 2024 19:41:22 -0500 -Subject: [PATCH 1/2] Chez Scheme: Repairs and improvements for building with - external dependencies - -* configure: support `ZUO=` - -Supplying `ZUO=` skips the submodule check in `configure` -and configures the generated makefile not to build or remove Zuo. - -* configure: support `STEXLIB=` - -For compatibility with older scripts, when not explicitly configured, -continue to honor the `STEXLIB` environment variable at build time. - -(cherry picked from commit 694fbd47a125c7fde10a328c6fda199dac19f802) ---- - racket/src/ChezScheme/BUILDING | 5 ++-- - racket/src/ChezScheme/build.zuo | 13 +++++++--- - racket/src/ChezScheme/configure | 27 ++++++++++++++++++++- - racket/src/ChezScheme/makefiles/Makefile.in | 6 ++--- - 4 files changed, 40 insertions(+), 11 deletions(-) - -diff --git a/racket/src/ChezScheme/BUILDING b/racket/src/ChezScheme/BUILDING -index 50fde27771..2df29b5bd8 100644 ---- a/racket/src/ChezScheme/BUILDING -+++ b/racket/src/ChezScheme/BUILDING -@@ -155,7 +155,8 @@ information on the supported options. - The generated makefile mostly just ensures that a `zuo` executable is - built in a `bin` directory, and then it defers the actual build work - to `zuo`, which uses the "main.zuo" file. If you have `zuo` installed, --you can use `zuo` directly instead of `make`. In general, instead of -+you can use `zuo` directly instead of `make`: in that case, you may -+wish to use `./configure ZUO=`. In general, instead of - the command `make X` to build target `X` as described below, you can - use `zuo . X` (or `bin/zuo . X` after `bin/zuo` is built). - -@@ -339,7 +340,7 @@ The makefile supports several targets: - * `make clean` - - Removes all built elements from the workarea, and then removes -- `bin/zuo`. -+ `bin/zuo` (unless configured with `ZUO=`). - - - WINDOWS VIA COMMAND PROMPT -diff --git a/racket/src/ChezScheme/build.zuo b/racket/src/ChezScheme/build.zuo -index a211632a89..432cc6e5a1 100644 ---- a/racket/src/ChezScheme/build.zuo -+++ b/racket/src/ChezScheme/build.zuo -@@ -218,10 +218,15 @@ - token)) - - (define stexlib -- (let ((found (assoc "STEXLIB" (hash-ref (runtime-env) 'env)))) -- (if found -- (cdr found) -- (at-source "stex")))) -+ (let ([configured (hash-ref config 'STEXLIB "")] -+ [env (assoc "STEXLIB" (hash-ref (runtime-env) 'env))]) -+ (cond -+ [(not (equal? "" configured)) -+ configured] -+ [env -+ (cdr env)] -+ [else -+ (at-source "stex")]))) - (define stex-sources - (source-tree stexlib)) - -diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure -index 721d1d1335..f88c6f7625 100755 ---- a/racket/src/ChezScheme/configure -+++ b/racket/src/ChezScheme/configure -@@ -93,6 +93,7 @@ default_warning_flags="-Wpointer-arith -Wall -Wextra -Wno-implicit-fallthrough" - CFLAGS_ADD= - zlibLib= - LZ4Lib= -+STEXLIB= - Kernel=KernelLib - buildKernelOnly=no - enableFrompb=yes -@@ -102,6 +103,7 @@ empetite=no - moreBootFiles= - preloadBootFiles= - alwaysUseBootFile= -+zuoExternal= - - CONFIG_UNAME=`uname` - -@@ -442,6 +444,12 @@ while [ $# != 0 ] ; do - LZ4=*) - LZ4Lib=`echo $1 | sed -e 's/^LZ4=//'` - ;; -+ STEXLIB=*) -+ STEXLIB=`echo $1 | sed -e 's/^STEXLIB=//'` -+ ;; -+ ZUO=*) -+ zuoExternal=`echo $1 | sed -e 's/^ZUO=//'` -+ ;; - *) - echo "option '$1' unrecognized or missing an argument; try $0 --help" - exit 1 -@@ -667,6 +675,8 @@ if [ "$help" = "yes" ]; then - echo " STRIP= executable stripper" - echo " ZLIB= link to instead of own zlib" - echo " LZ4= link to instead of own LZ4" -+ echo " STEXLIB= build docs with instead of own stex" -+ echo " ZUO= build with instead of own Zuo" - echo "" - echo "Available machine types: $machs" - echo "" -@@ -869,6 +879,16 @@ if [ "$addflags" = "yes" ] ; then - fi - fi - -+if [ "${zuoExternal}" = "" ] ; then -+ ZUO="bin/zuo" -+ RM_ZUO="rm -f bin/zuo" -+ ZUO_TARGET="bin/zuo" -+else -+ ZUO="${zuoExternal}" -+ RM_ZUO="@echo 'Not cleaning external ${zuoExternal}'" -+ ZUO_TARGET="DoNotBuildZuo" -+fi -+ - # more compile and link flags for c/Mf-unix and mats/Mf-unix - mdinclude= - mdcppflags= -@@ -1039,7 +1059,7 @@ cp "$srcdir"/makefiles/buildmain.zuo main.zuo - # Some idea, but in the workarea, so it refers to "workarea.zuo" here: - cp "$srcdir"/makefiles/workmain.zuo $w/main.zuo - --# The content of "$w/Makefile" records configuration decisions, -+# The content of "$w/Mf-config" records configuration decisions, - # and the Zuo build script takes it from there - cat > $w/Mf-config << END - srcdir=$srcdir -@@ -1075,6 +1095,7 @@ cursesLib=$cursesLib - ncursesLib=$ncursesLib - zlibLib=$zlibLib - LZ4Lib=$LZ4Lib -+STEXLIB=$STEXLIB - warningFlags=$warningFlags - Kernel=$Kernel - installscriptname=$installscriptname -@@ -1086,6 +1107,10 @@ preloadBootFiles=$preloadBootFiles - alwaysUseBootFile=$alwaysUseBootFile - relativeBootFiles=$relativeBootFiles - -+ZUO=$ZUO -+RM_ZUO=$RM_ZUO -+ZUO_TARGET=$ZUO_TARGET -+ - InstallBin=$installbin - InstallLib=$installlib - InstallMan=$installman/man1 -diff --git a/racket/src/ChezScheme/makefiles/Makefile.in b/racket/src/ChezScheme/makefiles/Makefile.in -index cfdd0230a3..4865bf2e2f 100644 ---- a/racket/src/ChezScheme/makefiles/Makefile.in -+++ b/racket/src/ChezScheme/makefiles/Makefile.in -@@ -3,8 +3,6 @@ workarea=$(w) - - include $(workarea)/Mf-config - --ZUO=bin/zuo -- - .PHONY: build - build: $(ZUO) - + $(ZUO) $(workarea) MAKE="$(MAKE)" -@@ -140,9 +138,9 @@ pkg: $(ZUO) - .PHONY: clean - clean: $(ZUO) - + $(ZUO) $(workarea) clean MAKE="$(MAKE)" -- rm -f bin/zuo -+ $(RM_ZUO) - - # Using `+` here means that $(ZUO) gets built even if `-n`/`--dry-run` is provided to `make` --$(ZUO): $(srcdir)/../zuo/zuo.c -+$(ZUO_TARGET): $(srcdir)/../zuo/zuo.c - + mkdir -p bin - + $(CC_FOR_BUILD) -DZUO_LIB_PATH='"'"$(upsrcdir)/../zuo/lib"'"' -o $(ZUO) $(srcdir)/../zuo/zuo.c - -base-commit: 78fef00d4d16a79fdf6ab31924b3a80cadf4b368 --- -2.41.0 - - -From e2bc69c5ce7437dd9a1b30ac1b12b3a56872c491 Mon Sep 17 00:00:00 2001 -From: Matthew Flatt -Date: Sun, 10 Mar 2024 09:13:40 -0600 -Subject: [PATCH 2/2] Chez Scheme: adjust `configure ZUO=` support - -Continuing from 694fbd47a1, adjust the generated makefile so the -supplied `` is not a makefile dependency. That way, `ZUO=zuo` -works if `zuo` is installed and the current build directory is not the -source directory. (The `zuo` executable is a dependency in a real and -relevant sense, but not in the sense of dependencies that we normally -track in makefiles.) - -Also adapt the makefile for the case that `ZUO=...` is not supplied -and the build directory is not the source directory, in which case -`ZUO_LIB_PATH` needs to be relative to the source directory. - -Using `make ZUO=zuo` can also work, but in that case, `bin/zuo` is -still built as a dependency. It's possible that some portable makefile -magic could overcome that limitation, but it doesn't seem important. - -(cherry picked from commit 28157ba88d48fe645563f46f6c00d6626b3428fa) ---- - racket/src/ChezScheme/configure | 3 + - racket/src/ChezScheme/makefiles/Makefile.in | 70 +++++++++++---------- - 2 files changed, 40 insertions(+), 33 deletions(-) - -diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure -index f88c6f7625..201dbe580f 100755 ---- a/racket/src/ChezScheme/configure -+++ b/racket/src/ChezScheme/configure -@@ -881,10 +881,12 @@ fi - - if [ "${zuoExternal}" = "" ] ; then - ZUO="bin/zuo" -+ ZUO_DEP="${ZUO}" - RM_ZUO="rm -f bin/zuo" - ZUO_TARGET="bin/zuo" - else - ZUO="${zuoExternal}" -+ ZUO_DEP="" - RM_ZUO="@echo 'Not cleaning external ${zuoExternal}'" - ZUO_TARGET="DoNotBuildZuo" - fi -@@ -1108,6 +1110,7 @@ alwaysUseBootFile=$alwaysUseBootFile - relativeBootFiles=$relativeBootFiles - - ZUO=$ZUO -+ZUO_DEP=$ZUO_DEP - RM_ZUO=$RM_ZUO - ZUO_TARGET=$ZUO_TARGET - -diff --git a/racket/src/ChezScheme/makefiles/Makefile.in b/racket/src/ChezScheme/makefiles/Makefile.in -index 4865bf2e2f..5ce237178e 100644 ---- a/racket/src/ChezScheme/makefiles/Makefile.in -+++ b/racket/src/ChezScheme/makefiles/Makefile.in -@@ -4,51 +4,55 @@ workarea=$(w) - include $(workarea)/Mf-config - - .PHONY: build --build: $(ZUO) -+build: $(ZUO_DEP) - + $(ZUO) $(workarea) MAKE="$(MAKE)" - - .PHONY: run --run: $(ZUO) -+run: $(ZUO_DEP) - + $(ZUO) $(workarea) run - - .PHONY: kernel --kernel: $(ZUO) -+kernel: $(ZUO_DEP) - + $(ZUO) $(workarea) kernel MAKE="$(MAKE)" - - .PHONY: install --install: $(ZUO) -+install: $(ZUO_DEP) - $(ZUO) $(workarea) install MAKE="$(MAKE)" - - .PHONY: uninstall --uninstall: $(ZUO) -+uninstall: $(ZUO_DEP) - + $(ZUO) $(workarea) uninstall MAKE="$(MAKE)" - --.PHONY: test --test: $(ZUO) -- + $(ZUO) $(workarea) test MAKE="$(MAKE)" -+.PHONY: test-one -+test-one: $(ZUO_DEP) -+ + $(ZUO) $(workarea) test-one MAKE="$(MAKE)" - - .PHONY: test-some-fast --test-some-fast: $(ZUO) -+test-some-fast: $(ZUO_DEP) - + $(ZUO) $(workarea) test-some-fast MAKE="$(MAKE)" - - .PHONY: test-some --test-some: $(ZUO) -+test-some: $(ZUO_DEP) - + $(ZUO) $(workarea) test-some MAKE="$(MAKE)" - -+.PHONY: test -+test: $(ZUO_DEP) -+ + $(ZUO) $(workarea) test MAKE="$(MAKE)" -+ - .PHONY: test-more --test-more: $(ZUO) -+test-more: $(ZUO_DEP) - + $(ZUO) $(workarea) test-more MAKE="$(MAKE)" - - .PHONY: coverage --coverage: $(ZUO) -+coverage: $(ZUO_DEP) - + $(ZUO) $(workarea) coverage MAKE="$(MAKE)" - - .PHONY: bootfiles --bootfiles: $(ZUO) -+bootfiles: $(ZUO_DEP) - + $(ZUO) $(workarea) bootfiles MAKE="$(MAKE)" - - .PHONY: reset --reset: $(ZUO) -+reset: $(ZUO_DEP) - + $(ZUO) $(workarea) reset MAKE="$(MAKE)" - - # Supply XM= to build boot files for -@@ -57,86 +61,86 @@ boot: - + $(ZUO) $(workarea) boot "$(XM)" MAKE="$(MAKE)" - - # `.boot` as alias for `boot XM=` --%.boot: $(ZUO) -+%.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot $* MAKE="$(MAKE)" - - .PHONY: auto.boot --auto.boot: $(ZUO) -+auto.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot MAKE="$(MAKE)" - - SCHEME=scheme - - .PHONY: cross.boot --cross.boot: $(ZUO) -+cross.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot SCHEME="$(SCHEME)" MAKE="$(MAKE)" - - .PHONY: re.boot --re.boot: $(ZUO) -+re.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) reboot SCHEME="$(SCHEME)" - - # Supply XM= to build boot files for - # with o=3 d=0 for the cross compiler, and only after - # building the kernel for the configured machine - .PHONY: bootquick --bootquick: $(ZUO) -+bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick "$(XM)" MAKE="$(MAKE)" - - # `.bootquick` as alias for `boot XM=` --%.bootquick: $(ZUO) -+%.bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick $* MAKE="$(MAKE)" - --auto.bootquick: $(ZUO) -+auto.bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick MAKE="$(MAKE)" - - # Supply XM=-.bootpbchunk to repackage boot files for - # with pbchunk sources, including additional - # boot files - .PHONY: bootpbchunk --bootpbchunk: $(ZUO) -+bootpbchunk: $(ZUO_DEP) - + $(ZUO) $(workarea) bootpbchunk "$(XM)" $(ARGS) MAKE="$(MAKE)" - - # `.bootpbchunk` as alias for `pbchunk XM=` --%.bootpbchunk: $(ZUO) -+%.bootpbchunk: $(ZUO_DEP) - + $(ZUO) $(workarea) bootpbchunk $* $(ARGS) MAKE="$(MAKE)" - - .PHONY: docs --docs: build $(ZUO) -+docs: build $(ZUO_DEP) - + $(ZUO) $(workarea) docs MAKE="$(MAKE)" - - .PHONY: csug --csug: build $(ZUO) -+csug: build $(ZUO_DEP) - + $(ZUO) $(workarea) csug MAKE="$(MAKE)" - - .PHONY: release_notes --release_notes: build $(ZUO) -+release_notes: build $(ZUO_DEP) - + $(ZUO) $(workarea) release_notes MAKE="$(MAKE)" - - .PHONY: install-docs --install-docs: build $(ZUO) -+install-docs: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-docs MAKE="$(MAKE)" - - .PHONY: install-csug --install-csug: build $(ZUO) -+install-csug: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-csug MAKE="$(MAKE)" - - .PHONY: install-release_notes --install-release_notes: build $(ZUO) -+install-release_notes: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-release_notes MAKE="$(MAKE)" - - .PHONY: bintar --bintar: $(ZUO) -+bintar: $(ZUO_DEP) - + $(ZUO) $(workarea) bintar MAKE="$(MAKE)" - - .PHONY: rpm --rpm: $(ZUO) -+rpm: $(ZUO_DEP) - + $(ZUO) $(workarea) rpm MAKE="$(MAKE)" - - .PHONY: pkg --pkg: $(ZUO) -+pkg: $(ZUO_DEP) - + $(ZUO) $(workarea) pkg MAKE="$(MAKE)" - - .PHONY: clean --clean: $(ZUO) -+clean: $(ZUO_DEP) - + $(ZUO) $(workarea) clean MAKE="$(MAKE)" - $(RM_ZUO) - --- -2.41.0 - diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index ab9687ca88..f43a314983 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -201,7 +201,7 @@ (define-module (gnu packages racket) ;; ;; CODE: -(define %racket-version "8.12") ; Remember to update chez-scheme-for-racket! +(define %racket-version "8.13") ; Remember to update chez-scheme-for-racket! (define %racket-commit (string-append "v" %racket-version)) (define %racket-origin @@ -211,10 +211,9 @@ (define %racket-origin (url "https://github.com/racket/racket") (commit %racket-commit))) (sha256 - (base32 "1f52yadmrsd2ddry47s68kxig185a58n19j23458wkck19nawjz5")) + (base32 "0pf9lmch7bz3gs4dbn2qb7mraxzjfiz50aij9zsli9jc022ybqb9")) (file-name (git-file-name "racket" %racket-version)) (patches (search-patches "racket-chez-scheme-bin-sh.patch" - "racket-backport-8.12-chez-configure.patch" "racket-rktio-bin-sh.patch")) (modules '((guix build utils))) (snippet @@ -709,7 +708,7 @@ (define-public racket "contract-profile" (base32 "1xm2z8g0dpv5d9h2sg680vx1a8ix9gbsdpxxb8qv1w7akp73paj3") '(("contract-profile" "."))) (simple-racket-origin - "data" (base32 "01sinnsnjiazvkj83k84izdnp38pd2aglbrs14mrdkwajgmpampk") + "data" (base32 "11ai6c9h0brbblc6xn045ajj4gyrvbjpk1pqcqm1m0dy9q2rzd4a") '("data" "data-doc" "data-enumerate-lib" "data-lib")) (simple-racket-origin "datalog" (base32 "0nf6cy4djpyhfvgpa6yn72apbz9s83gp0qg95pzjd0az4v6qwq1s") @@ -718,7 +717,7 @@ (define-public racket "db" (base32 "0xx0k8yw2vb9b4vk2dwjfbpixnmriqsv7kpv3fvfxbwyg42y0db5") '("db" "db-doc" "db-lib")) (simple-racket-origin - "deinprogramm" (base32 "0f41sh90i4mml95x2gcmfvl2rc7m77vjbagmgjx270ng7xvz16lj") + "deinprogramm" (base32 "05l643h1mc4v7jhs4fq7yi84zl24nk1zx6ld07a6zgn85kik3vzb") '("deinprogramm" "deinprogramm-signature")) (simple-racket-origin "distributed-places" (base32 "1dajpkj9balqcpv6cdk9hwjz592h1vq8rrx5vncariiac4vbdpa0") @@ -727,7 +726,7 @@ (define-public racket "draw" (base32 "1h7mckay8yjcgmj3r0jkf1csn430gn43n8jl1l956q9gcprlmncl") '("draw" "draw-doc" "draw-lib")) (simple-racket-origin - "drracket" (base32 "17bdbvsf5l8z96bwzg1q75gg70c6svbhw0g1k239fsjd3mivmki4") + "drracket" (base32 "155qzbg2jg5kbv580z30z4w1ac3p527ixk0daan86wkgpl0lxnzn") '("drracket" "drracket-plugin-lib" "drracket-tool" @@ -741,13 +740,13 @@ (define-public racket "eli-tester" (base32 "0icx6wn14gjm8kdmq1jppqgq87sxkras4qb5xmdr6wigxafhjqyk") '(("eli-tester" "."))) (simple-racket-origin - "eopl" (base32 "1n8lzvhggp6bp2hg4n51zg8f4ya10isb92pfzngss2ch7299zfj2") + "eopl" (base32 "0qihajdpwf2q7hbs6fsw6mmmzy57kgzgry3vyp9z8w7ay8df3w15") '(("eopl" "."))) (simple-racket-origin "errortrace" (base32 "0l9k2rx6z4jkid7kxhbs763s66pxbzvfrgxajykbrmqkv77lhb3w") '("errortrace" "errortrace-doc" "errortrace-lib")) (simple-racket-origin - "expeditor" (base32 "10841c60nxqvwnjn6f9c6dcp4vsqbvi7n8nvi59vjk7d3b2qfpbq") + "expeditor" (base32 "0m9ga4scg49pbv60gnl0ky5al72012psa4dfgnkzq0bnf5lwwm2i") '("expeditor" "expeditor-doc" "expeditor-lib")) (simple-racket-origin "frtime" (base32 "0ydz2yn8vvv6z7brwlswcyx0f31a6y6d443i89rysfvd2xkhpfd5") @@ -761,13 +760,13 @@ (define-public racket "games" (base32 "13z7fnbr48s98lmfxc0nbfhbqkd4hphymy2r63hqm783xzn6ylzi") '(("games" "."))) (simple-racket-origin - "gui" (base32 "08kzyscqc8hgc1f8q0bhibl44fkq8iiyz12f8bqdhqkcz8nx44sw") + "gui" (base32 "1vz3h9mwmycl9sbx19dsfkx5sqh71nwv360g80khwyvnsx99fxfs") '("gui" "gui-doc" "gui-lib" "tex-table")) (simple-racket-origin "gui-pkg-manager" (base32 "1ji9448d723nklqvycwdswj0ni28sabrncag14f9mx47did5myb5") '("gui-pkg-manager-lib")) (simple-racket-origin - "htdp" (base32 "13d8xsvs60d7797w93g14dbdm98bixgy65akayij256pyiwnqwdc") + "htdp" (base32 "0z58askwixx0vh99dmpbjvv099hkhykgnlgfs679vxbjcnfwafd6") '("htdp" "htdp-doc" "htdp-lib")) (simple-racket-origin "html" (base32 "18n1jnjgzfknc8nv8dppi85nb8q08gqdwkg6hfjk08x0p00anx2x") @@ -791,7 +790,7 @@ (define-public racket "make" (base32 "10852fj30bz5r46c3d99s37fkgy5yh44gb01j29sf3kxnhi0g2sa") '(("make" "."))) (simple-racket-origin - "math" (base32 "1l0r4xpbbjz0b2s6v3kn490zgs2q1dnj3ga95y1505jmcwgb2hl9") + "math" (base32 "03ybjcp1w38f539dzsh8qb5cw0mb2hslpyqwbcsqxj3l9vqjlm8y") '("math" "math-doc" "math-lib")) (simple-racket-origin "mysterx" (base32 "11p9jzrafw0hizhl0cs4sxx7rv281185q8hryic2rpk0kzjdyr48") @@ -809,7 +808,7 @@ (define-public racket (url "https://github.com/RenaissanceBug/racket-cookies") (commit %racket-commit))) (sha256 (base32 - "1zr31y1gqa3kkrwlf9bnw08nzij00x1l70qhfbpz0239bksn4mmb")) + "1fbl717w5801bydx3nzwxddd1rh1cc0gxwpjc7ka9zh5ak09sb0w")) (file-name (git-file-name "RenaissanceBug-racket-cookies" %racket-version))) '("net-cookies" "net-cookies-doc" "net-cookies-lib")) @@ -826,7 +825,7 @@ (define-public racket (git-file-name "stamourv-optimization-coach" %racket-version))) '(("optimization-coach" "."))) (simple-racket-origin - "option-contract" (base32 "07cncg9pi15cm19k7rzv54vx83wq7y42i2m6bgzaqja1h8vnj2ww") + "option-contract" (base32 "1914dcxy6qzpg3cpnzdm9lj0kwyw8xdb85mwiamqfkbg0xlyyhpa") '("option-contract" "option-contract-doc" "option-contract-lib")) (simple-racket-origin "parser-tools" (base32 "1lp7wixmxcnha7cz834xfqqr48c2nldjbn9lng69bihpw01h9zms") @@ -835,7 +834,7 @@ (define-public racket "pconvert" (base32 "00czi0p399mmyrvxyrs5kniizpkqfxyz2ncxqi2jy79a7wk79pb1") '("pconvert-lib")) (simple-racket-origin - "pict" (base32 "1ghds5by8i0k2djbig82xqp2ssy3nvdwm45l8ibsr99y0ay6z7gv") + "pict" (base32 "1swnwihfnbsz9k11515i0fbfhx1gn7qcygn1dxkrdvb89g4h1pf3") '("pict" "pict-doc" "pict-lib")) (simple-racket-origin "pict-snip" (base32 "081nwiy4a0n4f7xws16hqbhf0j3kz5alizndi3nnyr3chm4kng6x") @@ -844,13 +843,13 @@ (define-public racket "picturing-programs" (base32 "1g6xr39hx1j03gb3d4dljm3v91xcj2gfpq3dgy5xvplzr6cmmxgr") '(("picturing-programs" "."))) (simple-racket-origin - "plai" (base32 "18kz31pj4lanlf9mn2yc0q9sxis264wb4f9v85ga23wd7g1hrzbq") + "plai" (base32 "1vcplmrzk2wr0n0m4fa0nq9ir986d5nk3dvcd7h1rv2jvhkcqdaq") '("plai" "plai-doc" "plai-lib")) (simple-racket-origin "planet" (base32 "0r2yqrzrmdjjyr14k6hhlzc5kzrcx3583m1s02mhrcmpfw0s85w9") '("planet" "planet-doc" "planet-lib")) (simple-racket-origin - "plot" (base32 "0jq9a366g7b2c9vp6yvpqikvklgyd6p4xj6v224g99yj8cgip40b") + "plot" (base32 "0skmir4njxmh3yx3ng23dvwkal79dd3fd23ijk6lyk8b013w1kj2") '("plot" "plot-compat" "plot-doc" "plot-gui-lib" "plot-lib")) (simple-racket-origin "preprocessor" (base32 "1p5aid58ifnjy4xl0ysh85cq39k25661v975jrpk182z3k5621mg") @@ -889,7 +888,7 @@ (define-public racket "racklog" (base32 "0fr8xij0sssfnmwn6dfdi4jj3l62f2yj3jrjljv13kaycrfls032") '(("racklog" "."))) (simple-racket-origin - "rackunit" (base32 "06kpl51alm7akgmmh110ya28zgmx3as0szykfv2gwqmf7xcms1b7") + "rackunit" (base32 "18s2rg5y5i68m83z3b81dwv6ixm67iyv3varm9azmnr7di0gflzj") '("rackunit" "rackunit-doc" "rackunit-gui" @@ -905,7 +904,7 @@ (define-public racket "realm" (base32 "0rlvwyd6rpyl0zda4a5p8dp346fvqzc8555dgfnrhliymkxb6x4g") '(("realm" "."))) (simple-racket-origin - "redex" (base32 "1mwnxbfk2vbalndlq0996rzdi3a2z48m5xnb1ywzlsvnydrnkrk2") + "redex" (base32 "083ql7xx7slnpvyr0a8z2wdyib84lh155frjx8gmcisri5895z28") '("redex" "redex-benchmark" "redex-doc" @@ -920,7 +919,7 @@ (define-public racket "scheme-lib" (base32 "0pcf0y8rp4qyjhaz5ww5sr5diq0wpcdfrrnask7zapyklzx1jx8x") '(("scheme-lib" "."))) (simple-racket-origin - "scribble" (base32 "0rk5q9r9fw826ag0npk5cwkzkapj2p243wwm9gn2l7j7cr6z1rvb") + "scribble" (base32 "03sgcgq8s0dk2zbn4jm514lx720rdx2pj8plr0sy7j0wnvm3rzsi") '("scribble" "scribble-doc" "scribble-html-lib" @@ -949,10 +948,10 @@ (define-public racket "slideshow" (base32 "147s7si6lxx6hm84wk2rfplk6wprladl9zni9pdvaxfa25chrabf") '("slideshow" "slideshow-doc" "slideshow-exe" "slideshow-lib" "slideshow-plugin")) (simple-racket-origin - "snip" (base32 "1b90ccqilnyszbphms3svm3c7dbk7870ifybjjipss5srb32mj2d") + "snip" (base32 "1aikzimkxvdvf81jxacm2zm8xir7nx1j6l6539pywl3xaf3nb2fm") '("snip" "snip-lib")) (simple-racket-origin - "typed-racket" (base32 "0vdsyr0qhpvac6h8mfdy6vqrsqsfa7kpg39n3h637hccxyfxv63f") + "typed-racket" (base32 "1r746jaxi5xxrk2zsn6v7bhb0drnlf7nx1ni0lvf7mvhqw7f97ci") '("source-syntax" "typed-racket" "typed-racket-compatibility" @@ -960,7 +959,7 @@ (define-public racket "typed-racket-lib" "typed-racket-more")) (simple-racket-origin - "srfi" (base32 "1l3nr3a8mlp505aaxlyp4i8jfijmpyl9h1wwv8hzm4kzzjv4sl8p") + "srfi" (base32 "0z7kchsz9m6cb4qmbznzqs2px45fz1g81amg9zn7n1sa31x3jzch") '("srfi" "srfi-doc" "srfi-lib" "srfi-lite-lib")) (simple-racket-origin "string-constants" (base32 "0225f1wmq1n9f2x1pg50fssdnd4bpc11q1jgsykwf4ik4fnaa520") @@ -978,7 +977,7 @@ (define-public racket "unix-socket" (base32 "02dfwas5ynbpyz74w9kwb4wgb37y5wys7svrlmir8k0n9ph9vq0y") '("unix-socket" "unix-socket-doc" "unix-socket-lib")) (simple-racket-origin - "web-server" (base32 "1i4sxmcgj00ml7czsbyx1433hgf091n1p54xyal2f1fsskx5fg0y") + "web-server" (base32 "0wpsgdz38zxjrs4kazad71dl9y11cvn6jj4fz2maba77021byzyn") '("web-server" "web-server-doc" "web-server-lib")) (simple-racket-origin "wxme" (base32 "1qp5gr9gqsakiq3alw6m4yyv5vw4i3hp4y4nhq8vl2nkjmirvn0b") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 17 11:00:47 2024 Received: (at 71203) by debbugs.gnu.org; 17 Jun 2024 15:00:47 +0000 Received: from localhost ([127.0.0.1]:35062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJDqg-0008T9-OZ for submit@debbugs.gnu.org; Mon, 17 Jun 2024 11:00:47 -0400 Received: from fout3-smtp.messagingengine.com ([103.168.172.146]:33597) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJDqe-0008St-4s for 71203@debbugs.gnu.org; Mon, 17 Jun 2024 11:00:45 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfout.nyi.internal (Postfix) with ESMTP id 6634F138027C; Mon, 17 Jun 2024 11:00:36 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Mon, 17 Jun 2024 11:00:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm1; t=1718636436; x=1718722836; bh=t80ar/hbPF CyD7L87h3O8nf8ZXyB0ZDyN6bjuWeoWQg=; b=k02KMVKLR+kzjqhXGihhz+1zwz doDD1RwJ9Bfd5RkKe/hQVcC75IKQq+cQemy9KRI6hXy5AEshwhgT7I3IGFcO8Jpo g3qRVXNFXGU0lAlWfxIwu/u7NkhEYHdjRqRTIoJVESqxoeheOdTFcFcT5LHUma54 3h+/uujGPSjwlZJ84mz4oVCu/QpspH3ScQplIi66SRRO/smvNlAitHte0nTeQBax 8hIOJqYj2oyd5ffiw9qnoSXLp2I1JiCd+hleAoWioEezH3S5+8/M5Qn7BqfsPlmq Wr+9qEJZu6taA6D1sJW4V2EsdUC36Qo1Mc0jTzSq5XFdD0Nr+yUi6b6tCEmA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1718636436; x= 1718722836; bh=t80ar/hbPFCyD7L87h3O8nf8ZXyB0ZDyN6bjuWeoWQg=; b=Q F0JF0EqTlcAmyCNvT+IAWGlggwlKJgg1GzjUyQByssMp++yK2ylIWE6HczdWHKlk hYqcAq07FLreHTxr15ZGO3YW6jCgazcXr53jAyhVqrRgD0s8ccwEJ5MzYFfuzBFJ 8RIrUa2OvaHtD8PvwAsYIztdMnCyzOl5WHFU6y73PmndOfwwyRd+PlVQrdBjk8fU rI2Mtt8iPjwJQDe7VR4B9Q0f4M48bFINPOGnoGixTdiX7KPKJx1VoRMGmPvFZ1D/ OYl9JK0lUYiEGv+WRQOl2rnp8TE/cOLxaX6IyD2JT6vg7G192UCsrK+s3M3zDhxP aQFKjqwb4GUfDlsDMejEQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedvhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomheprfhhihhlihhpucfotgfirhgrthhhuceophhhihhlihhp sehphhhilhhiphhmtghgrhgrthhhrdgtohhmqeenucggtffrrghtthgvrhhnpeegfeegud dtveeiteefgfeuieeikeeugfejleelfeegheejuefgueeikedvgfevteenucffohhmrghi nhepghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 17 Jun 2024 11:00:35 -0400 (EDT) From: Philip McGrath To: 71203@debbugs.gnu.org Subject: [PATCH v2 0/3] gnu: racket: Update to 8.13. Date: Mon, 17 Jun 2024 11:00:08 -0400 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71203 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This v2 is just a rebase to try to trigger QA, as Ludo’ suggested in . Philip Philip McGrath (3): gnu: zuo: Update to 1.10. gnu: racket: Update to 8.13. gnu: chez-scheme: Backport test fix. gnu/local.mk | 2 +- gnu/packages/chez.scm | 5 +- .../patches/chez-scheme-backport-signal.patch | 87 ++++ .../racket-backport-8.12-chez-configure.patch | 423 ------------------ gnu/packages/racket.scm | 49 +- 5 files changed, 114 insertions(+), 452 deletions(-) create mode 100644 gnu/packages/patches/chez-scheme-backport-signal.patch delete mode 100644 gnu/packages/patches/racket-backport-8.12-chez-configure.patch base-commit: f9ed5788fda9288301550c641820d422e9ad1602 -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 17 11:00:58 2024 Received: (at 71203) by debbugs.gnu.org; 17 Jun 2024 15:00:58 +0000 Received: from localhost ([127.0.0.1]:35067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJDqs-0008TY-3l for submit@debbugs.gnu.org; Mon, 17 Jun 2024 11:00:58 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:51581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJDqq-0008TM-JS for 71203@debbugs.gnu.org; Mon, 17 Jun 2024 11:00:57 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 4D9AB114024F; Mon, 17 Jun 2024 11:00:49 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 17 Jun 2024 11:00:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to; s=fm1; t=1718636449; x=1718722849; bh=DPSJxqxcrpNe5ESFcVl45 jAhq2AZQapYK/EXuYVLQt8=; b=VVpU2lRDH0hRPzLmDyYHJfSDQIwmbkzgAU8oH VHp7upHbr7B5bvR3pnPeneMkryK93FBIpV0++d1c+ropISgK/QlPcThhfyHTidJH pK9TcgM0GZtSYVmBC0K88Vm+plAjYDRfwLpF3U89njHAShnJ2BMrWTIbL018hxhs WaWgMy/SwMmrcSjsCYRaKMxjwqpI9ins+GA9Vb49roLRIyDHFB+RFZUahkGZeQTv zLe8n1lzesi7ng+Ji4GBTL89Gzynpvf2VNcgjoNKKdo4bi4+oCO9jBKi2GKfofVj Ah/YjshA2fiOXiIooFBIXlQXjj9cTJLCfxEoGHphwag7GufpA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1718636449; x= 1718722849; bh=DPSJxqxcrpNe5ESFcVl45jAhq2AZQapYK/EXuYVLQt8=; b=d eWG6U12ENDmyEZaieJFm3i9NkihftvJ960rBqr4XYVRk2qvafbIZyFSLRcpI1N0y hOvqRxzHK+Ov54QWYixWEfojFAi87MmKOrUCsY4SYZOyUY1OR7+XJhlDSuik6MXG ZIMko7K7sbjMkeltsGgxiWQF0purLn50QyX7lCM6HKdOws+4/S8zowmWqWbRN63X DzDpPhKx/8cXigKWXBYiCZsJKrWdfaQCJ+EkJJaS1Fdm1tbMskPMyntbPsjyHUOI MGHq6giz047IBLO9kgdzFmD9MxGTat43aNU1zyKWbt3lxSc6ho877XJbghK8+6O2 2gM0e9COddl8zLu+whgTQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedvhedgkedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepudehvdefje etfffffeektdehtdetudfhtdfhuddtueeukefhveehhfehvdfhheffnecuffhomhgrihhn pehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 17 Jun 2024 11:00:48 -0400 (EDT) From: Philip McGrath To: 71203@debbugs.gnu.org Subject: [PATCH v2 1/3] gnu: zuo: Update to 1.10. Date: Mon, 17 Jun 2024 11:00:09 -0400 Message-ID: <4ee513bea1192abbc703521d70afe6aa1c27b667.1718636031.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71203 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/racket.scm (zuo): Update to 1.10. Change-Id: I082129143b77d34236e32e5cd4f4aac3275d4bca --- gnu/packages/racket.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 2b20353159..ab9687ca88 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -243,7 +243,7 @@ (define %racket-origin (define-public zuo (package (name "zuo") - (version "1.9") ; defined in racket/src/zuo/zuo.c or the following + (version "1.10") ; defined in racket/src/zuo/zuo.c or the following #;(displayln (~a (hash-ref (runtime-env) 'version) "." (hash-ref (runtime-env) 'minor-version))) (source (origin @@ -252,7 +252,7 @@ (define-public zuo (url "https://github.com/racket/zuo") (commit (string-append "v" version)))) (sha256 - (base32 "0zasir33nx1qi1ciz9dn6h8k39i443lr6apw5d1i6mjmhpzxmdhp")) + (base32 "007bjbhxbw3dq75klaa6f6ljhri2qxi43q6n74wyy50vr9yhx4s1")) (file-name (git-file-name name version)) (patches (search-patches "zuo-bin-sh.patch")))) (outputs '("out" "debug")) -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 17 11:01:09 2024 Received: (at 71203) by debbugs.gnu.org; 17 Jun 2024 15:01:09 +0000 Received: from localhost ([127.0.0.1]:35076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJDr2-0008Ua-E5 for submit@debbugs.gnu.org; Mon, 17 Jun 2024 11:01:09 -0400 Received: from fout3-smtp.messagingengine.com ([103.168.172.146]:55171) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJDqz-0008Ti-Nd for 71203@debbugs.gnu.org; Mon, 17 Jun 2024 11:01:07 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.nyi.internal (Postfix) with ESMTP id 8078A1380451; Mon, 17 Jun 2024 11:00:58 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Mon, 17 Jun 2024 11:00:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to; s=fm1; t=1718636458; x=1718722858; bh=WUGcf6HEWS7I1C+k0ex1V KrM/vxI1Btl/nt/UzYeDcE=; b=Fssc2hUluvsyN+g5DQFUmpfrVQCa2UjqRTha4 SZmA9UKNVCZgs4QUgz0qXLZ6LFbjIl3wQyZIH5+rPIEGYYrnOsCIKMv25Igx6VLL l4Rk2uM25r2nCXA327/MHKx/CgPKfxGcYD0H6uiviF1l5xqaWYo+qcQfHUpYmWej ITBVfn4qTFY7TaLmoEJ6A7AWQjaG4oOul6RC8xfS9jy9x5fkYAd/FXiEwBHNbkfN ipr/0afDbkbEUqzue0ASjC2rYJsx9V5hQY3+zqxcIc2sPr3VR1HYEyZ8v1u4BOSB P+59ehvDSfWS/6pZR/XuF/ih2JjOGd0ObycpINW1p0nLjK27Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1718636458; x= 1718722858; bh=WUGcf6HEWS7I1C+k0ex1VKrM/vxI1Btl/nt/UzYeDcE=; b=Y pf22klCiG/XYmc5yU3tDLz9m///HGR090ocHTOT+dAzWEPiALH6TS9TVkKWbfLLj cY4xbejv5+KzJi4yakDdHKkEeMaF/zRbwEGDmaWX9x/QI56TFuAmlhm+ZXzJp4QK dl3FqlxYhDnsDGbOFsuWAcNkzDGazLZxJKOpDdAxHWtLwbj8S1U2iMHd6xRSIFR5 baaTQ6TXEUvDrSMzItvO7Fuuc+qvH2lBOT34UD+zb/S8cAnr/tMQtK02EI1Cv0U8 XdRQsZp9KT9IncigMp08Wq/Wid/dfIQxdSyqPWPU8waa7WG+7Dx9hbqcm5zrcO8p fmBeyAP5U876kGkGPF9OA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedvhedgkeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepudehvdefje etfffffeektdehtdetudfhtdfhuddtueeukefhveehhfehvdfhheffnecuffhomhgrihhn pehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 17 Jun 2024 11:00:57 -0400 (EDT) From: Philip McGrath To: 71203@debbugs.gnu.org Subject: [PATCH v2 2/3] gnu: racket: Update to 8.13. Date: Mon, 17 Jun 2024 11:00:10 -0400 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71203 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/racket-backport-8.12-chez-configure.patch: Delete obsolete patch. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/racket.scm (%racket-origin)[patches]: Likewise. * gnu/packages/chez.scm (chez-scheme-for-racket): Update to 10.0.1-pre-release.1. * gnu/packages/racket.scm (%racket-version): Update to 8.13. (racket)[inputs] : Update hashes. Change-Id: I2d7b6e79a5a4e775d9b918b39fb688b484bb9f93 --- gnu/local.mk | 1 - gnu/packages/chez.scm | 2 +- .../racket-backport-8.12-chez-configure.patch | 423 ------------------ gnu/packages/racket.scm | 45 +- 4 files changed, 23 insertions(+), 448 deletions(-) delete mode 100644 gnu/packages/patches/racket-backport-8.12-chez-configure.patch diff --git a/gnu/local.mk b/gnu/local.mk index 83b7402b09..d2423aa93c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2024,7 +2024,6 @@ dist_patch_DATA = \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-chez-scheme-bin-sh.patch \ - %D%/packages/patches/racket-backport-8.12-chez-configure.patch \ %D%/packages/patches/racket-rktio-bin-sh.patch \ %D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/restartd-update-robust.patch \ diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index db582fa821..dd98966c78 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -297,7 +297,7 @@ (define-public chez-scheme-for-racket (name "chez-scheme-for-racket") ;; The version should match `(scheme-version-number #t)`. ;; See s/cmacros.ss c. line 360. - (version "9.9.9-pre-release.23") + (version "10.1.0-pre-release.1") (source #f) (build-system gnu-build-system) (inputs `(,@(if (nix-system->native-chez-machine-type) diff --git a/gnu/packages/patches/racket-backport-8.12-chez-configure.patch b/gnu/packages/patches/racket-backport-8.12-chez-configure.patch deleted file mode 100644 index 483948fec9..0000000000 --- a/gnu/packages/patches/racket-backport-8.12-chez-configure.patch +++ /dev/null @@ -1,423 +0,0 @@ -From 82157f5b3fb9f71ad7fc978c428d423d06a4a0df Mon Sep 17 00:00:00 2001 -From: Philip McGrath -Date: Wed, 28 Feb 2024 19:41:22 -0500 -Subject: [PATCH 1/2] Chez Scheme: Repairs and improvements for building with - external dependencies - -* configure: support `ZUO=` - -Supplying `ZUO=` skips the submodule check in `configure` -and configures the generated makefile not to build or remove Zuo. - -* configure: support `STEXLIB=` - -For compatibility with older scripts, when not explicitly configured, -continue to honor the `STEXLIB` environment variable at build time. - -(cherry picked from commit 694fbd47a125c7fde10a328c6fda199dac19f802) ---- - racket/src/ChezScheme/BUILDING | 5 ++-- - racket/src/ChezScheme/build.zuo | 13 +++++++--- - racket/src/ChezScheme/configure | 27 ++++++++++++++++++++- - racket/src/ChezScheme/makefiles/Makefile.in | 6 ++--- - 4 files changed, 40 insertions(+), 11 deletions(-) - -diff --git a/racket/src/ChezScheme/BUILDING b/racket/src/ChezScheme/BUILDING -index 50fde27771..2df29b5bd8 100644 ---- a/racket/src/ChezScheme/BUILDING -+++ b/racket/src/ChezScheme/BUILDING -@@ -155,7 +155,8 @@ information on the supported options. - The generated makefile mostly just ensures that a `zuo` executable is - built in a `bin` directory, and then it defers the actual build work - to `zuo`, which uses the "main.zuo" file. If you have `zuo` installed, --you can use `zuo` directly instead of `make`. In general, instead of -+you can use `zuo` directly instead of `make`: in that case, you may -+wish to use `./configure ZUO=`. In general, instead of - the command `make X` to build target `X` as described below, you can - use `zuo . X` (or `bin/zuo . X` after `bin/zuo` is built). - -@@ -339,7 +340,7 @@ The makefile supports several targets: - * `make clean` - - Removes all built elements from the workarea, and then removes -- `bin/zuo`. -+ `bin/zuo` (unless configured with `ZUO=`). - - - WINDOWS VIA COMMAND PROMPT -diff --git a/racket/src/ChezScheme/build.zuo b/racket/src/ChezScheme/build.zuo -index a211632a89..432cc6e5a1 100644 ---- a/racket/src/ChezScheme/build.zuo -+++ b/racket/src/ChezScheme/build.zuo -@@ -218,10 +218,15 @@ - token)) - - (define stexlib -- (let ((found (assoc "STEXLIB" (hash-ref (runtime-env) 'env)))) -- (if found -- (cdr found) -- (at-source "stex")))) -+ (let ([configured (hash-ref config 'STEXLIB "")] -+ [env (assoc "STEXLIB" (hash-ref (runtime-env) 'env))]) -+ (cond -+ [(not (equal? "" configured)) -+ configured] -+ [env -+ (cdr env)] -+ [else -+ (at-source "stex")]))) - (define stex-sources - (source-tree stexlib)) - -diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure -index 721d1d1335..f88c6f7625 100755 ---- a/racket/src/ChezScheme/configure -+++ b/racket/src/ChezScheme/configure -@@ -93,6 +93,7 @@ default_warning_flags="-Wpointer-arith -Wall -Wextra -Wno-implicit-fallthrough" - CFLAGS_ADD= - zlibLib= - LZ4Lib= -+STEXLIB= - Kernel=KernelLib - buildKernelOnly=no - enableFrompb=yes -@@ -102,6 +103,7 @@ empetite=no - moreBootFiles= - preloadBootFiles= - alwaysUseBootFile= -+zuoExternal= - - CONFIG_UNAME=`uname` - -@@ -442,6 +444,12 @@ while [ $# != 0 ] ; do - LZ4=*) - LZ4Lib=`echo $1 | sed -e 's/^LZ4=//'` - ;; -+ STEXLIB=*) -+ STEXLIB=`echo $1 | sed -e 's/^STEXLIB=//'` -+ ;; -+ ZUO=*) -+ zuoExternal=`echo $1 | sed -e 's/^ZUO=//'` -+ ;; - *) - echo "option '$1' unrecognized or missing an argument; try $0 --help" - exit 1 -@@ -667,6 +675,8 @@ if [ "$help" = "yes" ]; then - echo " STRIP= executable stripper" - echo " ZLIB= link to instead of own zlib" - echo " LZ4= link to instead of own LZ4" -+ echo " STEXLIB= build docs with instead of own stex" -+ echo " ZUO= build with instead of own Zuo" - echo "" - echo "Available machine types: $machs" - echo "" -@@ -869,6 +879,16 @@ if [ "$addflags" = "yes" ] ; then - fi - fi - -+if [ "${zuoExternal}" = "" ] ; then -+ ZUO="bin/zuo" -+ RM_ZUO="rm -f bin/zuo" -+ ZUO_TARGET="bin/zuo" -+else -+ ZUO="${zuoExternal}" -+ RM_ZUO="@echo 'Not cleaning external ${zuoExternal}'" -+ ZUO_TARGET="DoNotBuildZuo" -+fi -+ - # more compile and link flags for c/Mf-unix and mats/Mf-unix - mdinclude= - mdcppflags= -@@ -1039,7 +1059,7 @@ cp "$srcdir"/makefiles/buildmain.zuo main.zuo - # Some idea, but in the workarea, so it refers to "workarea.zuo" here: - cp "$srcdir"/makefiles/workmain.zuo $w/main.zuo - --# The content of "$w/Makefile" records configuration decisions, -+# The content of "$w/Mf-config" records configuration decisions, - # and the Zuo build script takes it from there - cat > $w/Mf-config << END - srcdir=$srcdir -@@ -1075,6 +1095,7 @@ cursesLib=$cursesLib - ncursesLib=$ncursesLib - zlibLib=$zlibLib - LZ4Lib=$LZ4Lib -+STEXLIB=$STEXLIB - warningFlags=$warningFlags - Kernel=$Kernel - installscriptname=$installscriptname -@@ -1086,6 +1107,10 @@ preloadBootFiles=$preloadBootFiles - alwaysUseBootFile=$alwaysUseBootFile - relativeBootFiles=$relativeBootFiles - -+ZUO=$ZUO -+RM_ZUO=$RM_ZUO -+ZUO_TARGET=$ZUO_TARGET -+ - InstallBin=$installbin - InstallLib=$installlib - InstallMan=$installman/man1 -diff --git a/racket/src/ChezScheme/makefiles/Makefile.in b/racket/src/ChezScheme/makefiles/Makefile.in -index cfdd0230a3..4865bf2e2f 100644 ---- a/racket/src/ChezScheme/makefiles/Makefile.in -+++ b/racket/src/ChezScheme/makefiles/Makefile.in -@@ -3,8 +3,6 @@ workarea=$(w) - - include $(workarea)/Mf-config - --ZUO=bin/zuo -- - .PHONY: build - build: $(ZUO) - + $(ZUO) $(workarea) MAKE="$(MAKE)" -@@ -140,9 +138,9 @@ pkg: $(ZUO) - .PHONY: clean - clean: $(ZUO) - + $(ZUO) $(workarea) clean MAKE="$(MAKE)" -- rm -f bin/zuo -+ $(RM_ZUO) - - # Using `+` here means that $(ZUO) gets built even if `-n`/`--dry-run` is provided to `make` --$(ZUO): $(srcdir)/../zuo/zuo.c -+$(ZUO_TARGET): $(srcdir)/../zuo/zuo.c - + mkdir -p bin - + $(CC_FOR_BUILD) -DZUO_LIB_PATH='"'"$(upsrcdir)/../zuo/lib"'"' -o $(ZUO) $(srcdir)/../zuo/zuo.c - -base-commit: 78fef00d4d16a79fdf6ab31924b3a80cadf4b368 --- -2.41.0 - - -From e2bc69c5ce7437dd9a1b30ac1b12b3a56872c491 Mon Sep 17 00:00:00 2001 -From: Matthew Flatt -Date: Sun, 10 Mar 2024 09:13:40 -0600 -Subject: [PATCH 2/2] Chez Scheme: adjust `configure ZUO=` support - -Continuing from 694fbd47a1, adjust the generated makefile so the -supplied `` is not a makefile dependency. That way, `ZUO=zuo` -works if `zuo` is installed and the current build directory is not the -source directory. (The `zuo` executable is a dependency in a real and -relevant sense, but not in the sense of dependencies that we normally -track in makefiles.) - -Also adapt the makefile for the case that `ZUO=...` is not supplied -and the build directory is not the source directory, in which case -`ZUO_LIB_PATH` needs to be relative to the source directory. - -Using `make ZUO=zuo` can also work, but in that case, `bin/zuo` is -still built as a dependency. It's possible that some portable makefile -magic could overcome that limitation, but it doesn't seem important. - -(cherry picked from commit 28157ba88d48fe645563f46f6c00d6626b3428fa) ---- - racket/src/ChezScheme/configure | 3 + - racket/src/ChezScheme/makefiles/Makefile.in | 70 +++++++++++---------- - 2 files changed, 40 insertions(+), 33 deletions(-) - -diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure -index f88c6f7625..201dbe580f 100755 ---- a/racket/src/ChezScheme/configure -+++ b/racket/src/ChezScheme/configure -@@ -881,10 +881,12 @@ fi - - if [ "${zuoExternal}" = "" ] ; then - ZUO="bin/zuo" -+ ZUO_DEP="${ZUO}" - RM_ZUO="rm -f bin/zuo" - ZUO_TARGET="bin/zuo" - else - ZUO="${zuoExternal}" -+ ZUO_DEP="" - RM_ZUO="@echo 'Not cleaning external ${zuoExternal}'" - ZUO_TARGET="DoNotBuildZuo" - fi -@@ -1108,6 +1110,7 @@ alwaysUseBootFile=$alwaysUseBootFile - relativeBootFiles=$relativeBootFiles - - ZUO=$ZUO -+ZUO_DEP=$ZUO_DEP - RM_ZUO=$RM_ZUO - ZUO_TARGET=$ZUO_TARGET - -diff --git a/racket/src/ChezScheme/makefiles/Makefile.in b/racket/src/ChezScheme/makefiles/Makefile.in -index 4865bf2e2f..5ce237178e 100644 ---- a/racket/src/ChezScheme/makefiles/Makefile.in -+++ b/racket/src/ChezScheme/makefiles/Makefile.in -@@ -4,51 +4,55 @@ workarea=$(w) - include $(workarea)/Mf-config - - .PHONY: build --build: $(ZUO) -+build: $(ZUO_DEP) - + $(ZUO) $(workarea) MAKE="$(MAKE)" - - .PHONY: run --run: $(ZUO) -+run: $(ZUO_DEP) - + $(ZUO) $(workarea) run - - .PHONY: kernel --kernel: $(ZUO) -+kernel: $(ZUO_DEP) - + $(ZUO) $(workarea) kernel MAKE="$(MAKE)" - - .PHONY: install --install: $(ZUO) -+install: $(ZUO_DEP) - $(ZUO) $(workarea) install MAKE="$(MAKE)" - - .PHONY: uninstall --uninstall: $(ZUO) -+uninstall: $(ZUO_DEP) - + $(ZUO) $(workarea) uninstall MAKE="$(MAKE)" - --.PHONY: test --test: $(ZUO) -- + $(ZUO) $(workarea) test MAKE="$(MAKE)" -+.PHONY: test-one -+test-one: $(ZUO_DEP) -+ + $(ZUO) $(workarea) test-one MAKE="$(MAKE)" - - .PHONY: test-some-fast --test-some-fast: $(ZUO) -+test-some-fast: $(ZUO_DEP) - + $(ZUO) $(workarea) test-some-fast MAKE="$(MAKE)" - - .PHONY: test-some --test-some: $(ZUO) -+test-some: $(ZUO_DEP) - + $(ZUO) $(workarea) test-some MAKE="$(MAKE)" - -+.PHONY: test -+test: $(ZUO_DEP) -+ + $(ZUO) $(workarea) test MAKE="$(MAKE)" -+ - .PHONY: test-more --test-more: $(ZUO) -+test-more: $(ZUO_DEP) - + $(ZUO) $(workarea) test-more MAKE="$(MAKE)" - - .PHONY: coverage --coverage: $(ZUO) -+coverage: $(ZUO_DEP) - + $(ZUO) $(workarea) coverage MAKE="$(MAKE)" - - .PHONY: bootfiles --bootfiles: $(ZUO) -+bootfiles: $(ZUO_DEP) - + $(ZUO) $(workarea) bootfiles MAKE="$(MAKE)" - - .PHONY: reset --reset: $(ZUO) -+reset: $(ZUO_DEP) - + $(ZUO) $(workarea) reset MAKE="$(MAKE)" - - # Supply XM= to build boot files for -@@ -57,86 +61,86 @@ boot: - + $(ZUO) $(workarea) boot "$(XM)" MAKE="$(MAKE)" - - # `.boot` as alias for `boot XM=` --%.boot: $(ZUO) -+%.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot $* MAKE="$(MAKE)" - - .PHONY: auto.boot --auto.boot: $(ZUO) -+auto.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot MAKE="$(MAKE)" - - SCHEME=scheme - - .PHONY: cross.boot --cross.boot: $(ZUO) -+cross.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot SCHEME="$(SCHEME)" MAKE="$(MAKE)" - - .PHONY: re.boot --re.boot: $(ZUO) -+re.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) reboot SCHEME="$(SCHEME)" - - # Supply XM= to build boot files for - # with o=3 d=0 for the cross compiler, and only after - # building the kernel for the configured machine - .PHONY: bootquick --bootquick: $(ZUO) -+bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick "$(XM)" MAKE="$(MAKE)" - - # `.bootquick` as alias for `boot XM=` --%.bootquick: $(ZUO) -+%.bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick $* MAKE="$(MAKE)" - --auto.bootquick: $(ZUO) -+auto.bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick MAKE="$(MAKE)" - - # Supply XM=-.bootpbchunk to repackage boot files for - # with pbchunk sources, including additional - # boot files - .PHONY: bootpbchunk --bootpbchunk: $(ZUO) -+bootpbchunk: $(ZUO_DEP) - + $(ZUO) $(workarea) bootpbchunk "$(XM)" $(ARGS) MAKE="$(MAKE)" - - # `.bootpbchunk` as alias for `pbchunk XM=` --%.bootpbchunk: $(ZUO) -+%.bootpbchunk: $(ZUO_DEP) - + $(ZUO) $(workarea) bootpbchunk $* $(ARGS) MAKE="$(MAKE)" - - .PHONY: docs --docs: build $(ZUO) -+docs: build $(ZUO_DEP) - + $(ZUO) $(workarea) docs MAKE="$(MAKE)" - - .PHONY: csug --csug: build $(ZUO) -+csug: build $(ZUO_DEP) - + $(ZUO) $(workarea) csug MAKE="$(MAKE)" - - .PHONY: release_notes --release_notes: build $(ZUO) -+release_notes: build $(ZUO_DEP) - + $(ZUO) $(workarea) release_notes MAKE="$(MAKE)" - - .PHONY: install-docs --install-docs: build $(ZUO) -+install-docs: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-docs MAKE="$(MAKE)" - - .PHONY: install-csug --install-csug: build $(ZUO) -+install-csug: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-csug MAKE="$(MAKE)" - - .PHONY: install-release_notes --install-release_notes: build $(ZUO) -+install-release_notes: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-release_notes MAKE="$(MAKE)" - - .PHONY: bintar --bintar: $(ZUO) -+bintar: $(ZUO_DEP) - + $(ZUO) $(workarea) bintar MAKE="$(MAKE)" - - .PHONY: rpm --rpm: $(ZUO) -+rpm: $(ZUO_DEP) - + $(ZUO) $(workarea) rpm MAKE="$(MAKE)" - - .PHONY: pkg --pkg: $(ZUO) -+pkg: $(ZUO_DEP) - + $(ZUO) $(workarea) pkg MAKE="$(MAKE)" - - .PHONY: clean --clean: $(ZUO) -+clean: $(ZUO_DEP) - + $(ZUO) $(workarea) clean MAKE="$(MAKE)" - $(RM_ZUO) - --- -2.41.0 - diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index ab9687ca88..f43a314983 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -201,7 +201,7 @@ (define-module (gnu packages racket) ;; ;; CODE: -(define %racket-version "8.12") ; Remember to update chez-scheme-for-racket! +(define %racket-version "8.13") ; Remember to update chez-scheme-for-racket! (define %racket-commit (string-append "v" %racket-version)) (define %racket-origin @@ -211,10 +211,9 @@ (define %racket-origin (url "https://github.com/racket/racket") (commit %racket-commit))) (sha256 - (base32 "1f52yadmrsd2ddry47s68kxig185a58n19j23458wkck19nawjz5")) + (base32 "0pf9lmch7bz3gs4dbn2qb7mraxzjfiz50aij9zsli9jc022ybqb9")) (file-name (git-file-name "racket" %racket-version)) (patches (search-patches "racket-chez-scheme-bin-sh.patch" - "racket-backport-8.12-chez-configure.patch" "racket-rktio-bin-sh.patch")) (modules '((guix build utils))) (snippet @@ -709,7 +708,7 @@ (define-public racket "contract-profile" (base32 "1xm2z8g0dpv5d9h2sg680vx1a8ix9gbsdpxxb8qv1w7akp73paj3") '(("contract-profile" "."))) (simple-racket-origin - "data" (base32 "01sinnsnjiazvkj83k84izdnp38pd2aglbrs14mrdkwajgmpampk") + "data" (base32 "11ai6c9h0brbblc6xn045ajj4gyrvbjpk1pqcqm1m0dy9q2rzd4a") '("data" "data-doc" "data-enumerate-lib" "data-lib")) (simple-racket-origin "datalog" (base32 "0nf6cy4djpyhfvgpa6yn72apbz9s83gp0qg95pzjd0az4v6qwq1s") @@ -718,7 +717,7 @@ (define-public racket "db" (base32 "0xx0k8yw2vb9b4vk2dwjfbpixnmriqsv7kpv3fvfxbwyg42y0db5") '("db" "db-doc" "db-lib")) (simple-racket-origin - "deinprogramm" (base32 "0f41sh90i4mml95x2gcmfvl2rc7m77vjbagmgjx270ng7xvz16lj") + "deinprogramm" (base32 "05l643h1mc4v7jhs4fq7yi84zl24nk1zx6ld07a6zgn85kik3vzb") '("deinprogramm" "deinprogramm-signature")) (simple-racket-origin "distributed-places" (base32 "1dajpkj9balqcpv6cdk9hwjz592h1vq8rrx5vncariiac4vbdpa0") @@ -727,7 +726,7 @@ (define-public racket "draw" (base32 "1h7mckay8yjcgmj3r0jkf1csn430gn43n8jl1l956q9gcprlmncl") '("draw" "draw-doc" "draw-lib")) (simple-racket-origin - "drracket" (base32 "17bdbvsf5l8z96bwzg1q75gg70c6svbhw0g1k239fsjd3mivmki4") + "drracket" (base32 "155qzbg2jg5kbv580z30z4w1ac3p527ixk0daan86wkgpl0lxnzn") '("drracket" "drracket-plugin-lib" "drracket-tool" @@ -741,13 +740,13 @@ (define-public racket "eli-tester" (base32 "0icx6wn14gjm8kdmq1jppqgq87sxkras4qb5xmdr6wigxafhjqyk") '(("eli-tester" "."))) (simple-racket-origin - "eopl" (base32 "1n8lzvhggp6bp2hg4n51zg8f4ya10isb92pfzngss2ch7299zfj2") + "eopl" (base32 "0qihajdpwf2q7hbs6fsw6mmmzy57kgzgry3vyp9z8w7ay8df3w15") '(("eopl" "."))) (simple-racket-origin "errortrace" (base32 "0l9k2rx6z4jkid7kxhbs763s66pxbzvfrgxajykbrmqkv77lhb3w") '("errortrace" "errortrace-doc" "errortrace-lib")) (simple-racket-origin - "expeditor" (base32 "10841c60nxqvwnjn6f9c6dcp4vsqbvi7n8nvi59vjk7d3b2qfpbq") + "expeditor" (base32 "0m9ga4scg49pbv60gnl0ky5al72012psa4dfgnkzq0bnf5lwwm2i") '("expeditor" "expeditor-doc" "expeditor-lib")) (simple-racket-origin "frtime" (base32 "0ydz2yn8vvv6z7brwlswcyx0f31a6y6d443i89rysfvd2xkhpfd5") @@ -761,13 +760,13 @@ (define-public racket "games" (base32 "13z7fnbr48s98lmfxc0nbfhbqkd4hphymy2r63hqm783xzn6ylzi") '(("games" "."))) (simple-racket-origin - "gui" (base32 "08kzyscqc8hgc1f8q0bhibl44fkq8iiyz12f8bqdhqkcz8nx44sw") + "gui" (base32 "1vz3h9mwmycl9sbx19dsfkx5sqh71nwv360g80khwyvnsx99fxfs") '("gui" "gui-doc" "gui-lib" "tex-table")) (simple-racket-origin "gui-pkg-manager" (base32 "1ji9448d723nklqvycwdswj0ni28sabrncag14f9mx47did5myb5") '("gui-pkg-manager-lib")) (simple-racket-origin - "htdp" (base32 "13d8xsvs60d7797w93g14dbdm98bixgy65akayij256pyiwnqwdc") + "htdp" (base32 "0z58askwixx0vh99dmpbjvv099hkhykgnlgfs679vxbjcnfwafd6") '("htdp" "htdp-doc" "htdp-lib")) (simple-racket-origin "html" (base32 "18n1jnjgzfknc8nv8dppi85nb8q08gqdwkg6hfjk08x0p00anx2x") @@ -791,7 +790,7 @@ (define-public racket "make" (base32 "10852fj30bz5r46c3d99s37fkgy5yh44gb01j29sf3kxnhi0g2sa") '(("make" "."))) (simple-racket-origin - "math" (base32 "1l0r4xpbbjz0b2s6v3kn490zgs2q1dnj3ga95y1505jmcwgb2hl9") + "math" (base32 "03ybjcp1w38f539dzsh8qb5cw0mb2hslpyqwbcsqxj3l9vqjlm8y") '("math" "math-doc" "math-lib")) (simple-racket-origin "mysterx" (base32 "11p9jzrafw0hizhl0cs4sxx7rv281185q8hryic2rpk0kzjdyr48") @@ -809,7 +808,7 @@ (define-public racket (url "https://github.com/RenaissanceBug/racket-cookies") (commit %racket-commit))) (sha256 (base32 - "1zr31y1gqa3kkrwlf9bnw08nzij00x1l70qhfbpz0239bksn4mmb")) + "1fbl717w5801bydx3nzwxddd1rh1cc0gxwpjc7ka9zh5ak09sb0w")) (file-name (git-file-name "RenaissanceBug-racket-cookies" %racket-version))) '("net-cookies" "net-cookies-doc" "net-cookies-lib")) @@ -826,7 +825,7 @@ (define-public racket (git-file-name "stamourv-optimization-coach" %racket-version))) '(("optimization-coach" "."))) (simple-racket-origin - "option-contract" (base32 "07cncg9pi15cm19k7rzv54vx83wq7y42i2m6bgzaqja1h8vnj2ww") + "option-contract" (base32 "1914dcxy6qzpg3cpnzdm9lj0kwyw8xdb85mwiamqfkbg0xlyyhpa") '("option-contract" "option-contract-doc" "option-contract-lib")) (simple-racket-origin "parser-tools" (base32 "1lp7wixmxcnha7cz834xfqqr48c2nldjbn9lng69bihpw01h9zms") @@ -835,7 +834,7 @@ (define-public racket "pconvert" (base32 "00czi0p399mmyrvxyrs5kniizpkqfxyz2ncxqi2jy79a7wk79pb1") '("pconvert-lib")) (simple-racket-origin - "pict" (base32 "1ghds5by8i0k2djbig82xqp2ssy3nvdwm45l8ibsr99y0ay6z7gv") + "pict" (base32 "1swnwihfnbsz9k11515i0fbfhx1gn7qcygn1dxkrdvb89g4h1pf3") '("pict" "pict-doc" "pict-lib")) (simple-racket-origin "pict-snip" (base32 "081nwiy4a0n4f7xws16hqbhf0j3kz5alizndi3nnyr3chm4kng6x") @@ -844,13 +843,13 @@ (define-public racket "picturing-programs" (base32 "1g6xr39hx1j03gb3d4dljm3v91xcj2gfpq3dgy5xvplzr6cmmxgr") '(("picturing-programs" "."))) (simple-racket-origin - "plai" (base32 "18kz31pj4lanlf9mn2yc0q9sxis264wb4f9v85ga23wd7g1hrzbq") + "plai" (base32 "1vcplmrzk2wr0n0m4fa0nq9ir986d5nk3dvcd7h1rv2jvhkcqdaq") '("plai" "plai-doc" "plai-lib")) (simple-racket-origin "planet" (base32 "0r2yqrzrmdjjyr14k6hhlzc5kzrcx3583m1s02mhrcmpfw0s85w9") '("planet" "planet-doc" "planet-lib")) (simple-racket-origin - "plot" (base32 "0jq9a366g7b2c9vp6yvpqikvklgyd6p4xj6v224g99yj8cgip40b") + "plot" (base32 "0skmir4njxmh3yx3ng23dvwkal79dd3fd23ijk6lyk8b013w1kj2") '("plot" "plot-compat" "plot-doc" "plot-gui-lib" "plot-lib")) (simple-racket-origin "preprocessor" (base32 "1p5aid58ifnjy4xl0ysh85cq39k25661v975jrpk182z3k5621mg") @@ -889,7 +888,7 @@ (define-public racket "racklog" (base32 "0fr8xij0sssfnmwn6dfdi4jj3l62f2yj3jrjljv13kaycrfls032") '(("racklog" "."))) (simple-racket-origin - "rackunit" (base32 "06kpl51alm7akgmmh110ya28zgmx3as0szykfv2gwqmf7xcms1b7") + "rackunit" (base32 "18s2rg5y5i68m83z3b81dwv6ixm67iyv3varm9azmnr7di0gflzj") '("rackunit" "rackunit-doc" "rackunit-gui" @@ -905,7 +904,7 @@ (define-public racket "realm" (base32 "0rlvwyd6rpyl0zda4a5p8dp346fvqzc8555dgfnrhliymkxb6x4g") '(("realm" "."))) (simple-racket-origin - "redex" (base32 "1mwnxbfk2vbalndlq0996rzdi3a2z48m5xnb1ywzlsvnydrnkrk2") + "redex" (base32 "083ql7xx7slnpvyr0a8z2wdyib84lh155frjx8gmcisri5895z28") '("redex" "redex-benchmark" "redex-doc" @@ -920,7 +919,7 @@ (define-public racket "scheme-lib" (base32 "0pcf0y8rp4qyjhaz5ww5sr5diq0wpcdfrrnask7zapyklzx1jx8x") '(("scheme-lib" "."))) (simple-racket-origin - "scribble" (base32 "0rk5q9r9fw826ag0npk5cwkzkapj2p243wwm9gn2l7j7cr6z1rvb") + "scribble" (base32 "03sgcgq8s0dk2zbn4jm514lx720rdx2pj8plr0sy7j0wnvm3rzsi") '("scribble" "scribble-doc" "scribble-html-lib" @@ -949,10 +948,10 @@ (define-public racket "slideshow" (base32 "147s7si6lxx6hm84wk2rfplk6wprladl9zni9pdvaxfa25chrabf") '("slideshow" "slideshow-doc" "slideshow-exe" "slideshow-lib" "slideshow-plugin")) (simple-racket-origin - "snip" (base32 "1b90ccqilnyszbphms3svm3c7dbk7870ifybjjipss5srb32mj2d") + "snip" (base32 "1aikzimkxvdvf81jxacm2zm8xir7nx1j6l6539pywl3xaf3nb2fm") '("snip" "snip-lib")) (simple-racket-origin - "typed-racket" (base32 "0vdsyr0qhpvac6h8mfdy6vqrsqsfa7kpg39n3h637hccxyfxv63f") + "typed-racket" (base32 "1r746jaxi5xxrk2zsn6v7bhb0drnlf7nx1ni0lvf7mvhqw7f97ci") '("source-syntax" "typed-racket" "typed-racket-compatibility" @@ -960,7 +959,7 @@ (define-public racket "typed-racket-lib" "typed-racket-more")) (simple-racket-origin - "srfi" (base32 "1l3nr3a8mlp505aaxlyp4i8jfijmpyl9h1wwv8hzm4kzzjv4sl8p") + "srfi" (base32 "0z7kchsz9m6cb4qmbznzqs2px45fz1g81amg9zn7n1sa31x3jzch") '("srfi" "srfi-doc" "srfi-lib" "srfi-lite-lib")) (simple-racket-origin "string-constants" (base32 "0225f1wmq1n9f2x1pg50fssdnd4bpc11q1jgsykwf4ik4fnaa520") @@ -978,7 +977,7 @@ (define-public racket "unix-socket" (base32 "02dfwas5ynbpyz74w9kwb4wgb37y5wys7svrlmir8k0n9ph9vq0y") '("unix-socket" "unix-socket-doc" "unix-socket-lib")) (simple-racket-origin - "web-server" (base32 "1i4sxmcgj00ml7czsbyx1433hgf091n1p54xyal2f1fsskx5fg0y") + "web-server" (base32 "0wpsgdz38zxjrs4kazad71dl9y11cvn6jj4fz2maba77021byzyn") '("web-server" "web-server-doc" "web-server-lib")) (simple-racket-origin "wxme" (base32 "1qp5gr9gqsakiq3alw6m4yyv5vw4i3hp4y4nhq8vl2nkjmirvn0b") -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 17 11:02:03 2024 Received: (at 71203) by debbugs.gnu.org; 17 Jun 2024 15:02:03 +0000 Received: from localhost ([127.0.0.1]:35087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJDru-0008WC-Vf for submit@debbugs.gnu.org; Mon, 17 Jun 2024 11:02:03 -0400 Received: from fout3-smtp.messagingengine.com ([103.168.172.146]:51917) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJDrs-0008VY-FO for 71203@debbugs.gnu.org; Mon, 17 Jun 2024 11:02:01 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.nyi.internal (Postfix) with ESMTP id 481DC1380242; Mon, 17 Jun 2024 11:01:53 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 17 Jun 2024 11:01:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= philipmcgrath.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to; s=fm1; t=1718636513; x=1718722913; bh=0KwuUWn7JZYn+RAqprpjz jgheULTH/L4cx61oqx0xUo=; b=x/T2Ast4IJva47SBYrusKDnzP6EJUHwcFKaqg vVSwkKMUj+MnWN8M40BqCi/GynfIw7BcU13I5PlqIfaxPYJ4Rqna0Yj7+RqdqPZU BAVDYvAoDmW1xKEcITOt5CINsF7iSZ9+HAe5ZzkNpQ03wHWwlsfxvbAv0RxVu5Sw 4o5TjHberoE5pjOclH+ITwZkiYDhisBwjgIpgFKQcSK5Q0Sp1gQleokrzwFIsO8k 82jCBTjO14EoiiFzcqmI8KkrFDhLjztSeBB1KoJs9ZhRuAxMkJL5fCh8SkFdGW+/ Ga3s4t+QLAK59onfdr4iJWaphovy5qwoQitWQwAY8aZRrpWxw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1718636513; x= 1718722913; bh=0KwuUWn7JZYn+RAqprpjzjgheULTH/L4cx61oqx0xUo=; b=X AkjvwOdiiEzqtEajXHNYhGbx9wz03kaeuL26km2K9WuN7aW/JWwDZSWC23N20lWo 5nvfWOM7x2e8Fmh7h0jF12PN7fSLuNZfmLgqfeBwI5n7tVkJd52MHXspTS/Yj+LL qBM4Z5neZYYK7joO1ovIYd7qfkfo47VcECUxdS5FNBZW9/ZwEueNmet6jxdLWzj/ OkL0mfq8xpA0Y6PWQeH59Uv7MZo6Q0kR1r7DvfoeGiVtsDtorgB2l3HBYPSxapxS YEc1176xHggYBjlvF3uCg+GUUYVGalbOQOOWc0Yzgg0crp2mCwKplOqJiQuQB8+9 dFCIPUK+Ty7S1b8V3uc+A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedvhedgkedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefrhhhilhhiphcuofgtifhrrghthhcuoehphhhilhhiphes phhhihhlihhpmhgtghhrrghthhdrtghomheqnecuggftrfgrthhtvghrnhepudehvdefje etfffffeektdehtdetudfhtdfhuddtueeukefhveehhfehvdfhheffnecuffhomhgrihhn pehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmh grihhlfhhrohhmpehphhhilhhiphesphhhihhlihhpmhgtghhrrghthhdrtghomh X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 17 Jun 2024 11:01:52 -0400 (EDT) From: Philip McGrath To: 71203@debbugs.gnu.org Subject: [PATCH v2 3/3] gnu: chez-scheme: Backport test fix. Date: Mon, 17 Jun 2024 11:00:11 -0400 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Philip McGrath Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 71203 Cc: Philip McGrath X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) The backported commit fixes crashes when signals are delivered to non-Scheme threads, including GC worker threads and threads created by foreign libraries. This appears to have been the cause of the intermittent test failures we have experienced. * gnu/packages/patches/chez-scheme-backport-signal.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/chez-scheme.scm (chez-scheme)[source]: Use it. (chez-scheme-for-racket, chez-scheme): Enable tests. Change-Id: Ifd87ca0d1707ef6ad067d883772a5b42803ead94 --- gnu/local.mk | 1 + gnu/packages/chez.scm | 3 +- .../patches/chez-scheme-backport-signal.patch | 87 +++++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/chez-scheme-backport-signal.patch diff --git a/gnu/local.mk b/gnu/local.mk index d2423aa93c..059bcdc842 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1028,6 +1028,7 @@ dist_patch_DATA = \ %D%/packages/patches/ccextractor-autoconf-tesseract.patch \ %D%/packages/patches/ccextractor-fix-ocr.patch \ %D%/packages/patches/chez-scheme-backport-configure.patch \ + %D%/packages/patches/chez-scheme-backport-signal.patch \ %D%/packages/patches/chez-scheme-bin-sh.patch \ %D%/packages/patches/circos-remove-findbin.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index dd98966c78..8c52bbb188 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -329,8 +329,6 @@ (define-public chez-scheme-for-racket (ice-9 match) (srfi srfi-34)) #:out-of-source? #t - ;; Intermittent failures: https://github.com/cisco/ChezScheme/issues/809 - #:tests? #f #:test-target "test" ; test-one test-some-fast test-some test test-more #:configure-flags #~`(,@(let* ((chez+version (strip-store-file-name #$output)) @@ -509,6 +507,7 @@ (define-public chez-scheme "1q66vafhiwk617z51qkm1v64r3bxqhhf5lzrmsa4l9d5yhvlyk09")) (file-name (git-file-name name version)) (patches (search-patches "chez-scheme-backport-configure.patch" + "chez-scheme-backport-signal.patch" "chez-scheme-bin-sh.patch")) (snippet #~(begin (use-modules (guix build utils)) diff --git a/gnu/packages/patches/chez-scheme-backport-signal.patch b/gnu/packages/patches/chez-scheme-backport-signal.patch new file mode 100644 index 0000000000..1fee32b167 --- /dev/null +++ b/gnu/packages/patches/chez-scheme-backport-signal.patch @@ -0,0 +1,87 @@ +From e416651d8b53fa2eca6edde764a9131d128cd166 Mon Sep 17 00:00:00 2001 +From: Matthew Flatt +Date: Sat, 2 Mar 2024 07:18:41 -0700 +Subject: [PATCH] constrain signal delivery to Scheme to the main thread (#813) + +The intent is to avoid crashes when a signal gets delimited to a +thread that might not even be a Scheme thread. Also, we don't try to +queue the event directly in the main thread's context, because then +we'd need more of a lock (while signal handling is otherwise an +implicit lock). + +(cherry picked from commit fc081fc447a786dd53286e5d7314b7217631cb68) +--- + +Notes: + This should fix intermittent test failures experienced by Guix: + see . + + c/globals.h | 1 + + c/schsig.c | 10 ++++++++++ + c/thread.c | 1 + + csug/system.stex | 2 ++ + 4 files changed, 14 insertions(+) + +diff --git a/c/globals.h b/c/globals.h +index d2a08299..eb2965c5 100644 +--- a/c/globals.h ++++ b/c/globals.h +@@ -49,6 +49,7 @@ EXTERN int S_num_preserve_ownership_threads; + # ifdef IMPLICIT_ATOMIC_AS_EXPLICIT + EXTERN s_thread_mutex_t S_implicit_mutex; + # endif ++EXTERN s_thread_t S_main_thread_id; + #endif + + /* segment.c */ +diff --git a/c/schsig.c b/c/schsig.c +index a89ab62a..04677730 100644 +--- a/c/schsig.c ++++ b/c/schsig.c +@@ -666,6 +666,16 @@ ptr S_dequeue_scheme_signals(ptr tc) { + static void forward_signal_to_scheme(INT sig) { + ptr tc = get_thread_context(); + ++#ifdef PTHREADS ++ /* deliver signals to the main thread, only; depending ++ on the threads that are running, `tc` might even be NULL */ ++ if (tc != TO_PTR(&S_G.thread_context)) { ++ pthread_kill(S_main_thread_id, sig); ++ RESET_SIGNAL ++ return; ++ } ++#endif ++ + if (enqueue_scheme_signal(tc, sig)) { + SIGNALINTERRUPTPENDING(tc) = Strue; + SOMETHINGPENDING(tc) = Strue; +diff --git a/c/thread.c b/c/thread.c +index 9a341b22..f130f44d 100644 +--- a/c/thread.c ++++ b/c/thread.c +@@ -40,6 +40,7 @@ void S_thread_init(void) { + s_thread_cond_init(&S_terminated_cond); + S_alloc_mutex.owner = 0; + S_alloc_mutex.count = 0; ++ S_main_thread_id = s_thread_self(); + + # ifdef IMPLICIT_ATOMIC_AS_EXPLICIT + s_thread_mutex_init(&S_implicit_mutex); +diff --git a/csug/system.stex b/csug/system.stex +index d4f2bcbb..bb89f419 100644 +--- a/csug/system.stex ++++ b/csug/system.stex +@@ -547,6 +547,8 @@ After a signal handler for a given signal has been registered, receipt + of the specified signal results in a call to the handler. + The handler is passed the signal number, allowing the same handler to + be used for different signals while differentiating among them. ++In a threaded version of the system, signals are always delivered to ++the main thread. + + Signals handled in this fashion are treated like keyboard interrupts in + that the handler is not called immediately when the signal is delivered + +base-commit: 253230f7dfbb4fe777277d6bbf93f39f9567f086 +-- +2.41.0 + -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 09 10:12:50 2024 Received: (at 71203-done) by debbugs.gnu.org; 9 Jul 2024 14:12:50 +0000 Received: from localhost ([127.0.0.1]:53812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRBaJ-0001Jr-04 for submit@debbugs.gnu.org; Tue, 09 Jul 2024 10:12:50 -0400 Received: from mail-qv1-f48.google.com ([209.85.219.48]:51225) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRBaF-0001Jb-SF for 71203-done@debbugs.gnu.org; Tue, 09 Jul 2024 10:12:44 -0400 Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-6b61689d7c9so8535316d6.2 for <71203-done@debbugs.gnu.org>; Tue, 09 Jul 2024 07:12:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720534292; x=1721139092; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=7fs1cxKlg1Xi23MqhlPUNjHkIUNQd9lRdbWe1cvakdI=; b=MS6wzlHWj4AqdV3ClwymdNmrTY+4PwdFJBT7eNdT+dz/kJ9Hgdsl26uoKoWw0wmLyJ POl9dZxequlB9mcxIDZJMuvUPFdWhb1S/wNBYPoNC06+F2Cq6U3I3Y/8tS9I1duphara 8hXTa4Q5g6mQBK7pFdV53t/JH4TGEN8yKFu2on03Zz4stMRgK4eqyOr2IUIyyEtXAa/y GDOhjTj+8Qb+027mEBAymTxA55BNvi710JOzsggcsc/mo493vEh2pM67e2IQa89lZhgb TupDJLlUsxOixk+hQ6VynNYNsyDjNLV57egHeoY5RV/ChYRJ8Hdb5JJrX3Qcg1KyE6/n qRgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720534292; x=1721139092; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7fs1cxKlg1Xi23MqhlPUNjHkIUNQd9lRdbWe1cvakdI=; b=FU1XtITS8p2A9SaUR4woP0XuL/t0u24A9xiGKyJ51HRIn3j3ENh4piv9uMQbUwnXl4 oTHwu2eZ89PSHVI/eyPviOzMd95F7okgrj3XcAJpYQfcHkcBfq1w5JcUBujZnxc/EY3k zU50Kio8YPxnT79G71tjfsgG32UlJqHKd4LDV5Ib50wWEj42NkF/cqqH15UW66wMe25I ZoJKkf+77gwHX6EX2Mlevh3E4aTWyRm9NuS6o6Q9gCivDrULAyqs2B0jxq6Eb/f/ri7P qlSVghwOY4OXqPuGv7neMeJDDLH7ATJz3qhoh1PoKoAFizGdpo2ZWp52fFG5lJB21qBp kd+A== X-Gm-Message-State: AOJu0Yw8nFCaLU+vZ7rwtcPkC/Yx0YJz8JWjCczONAfRBpOu8O4nK9aC DkO9T4vefLp71AfrS1NMSovnmr9VDfrHS2SQQmyyhDAMjl8mDAdz X-Google-Smtp-Source: AGHT+IF4fCl2N2SG4iZRYErUrPEItf9EPiufTD3h68DXBo9hRF0RiMAMqVb6PvoKm0gJn7wu4rPetw== X-Received: by 2002:a05:6214:19c8:b0:6b4:f761:f0b8 with SMTP id 6a1803df08f44-6b61bc7f095mr37134276d6.8.1720534292518; Tue, 09 Jul 2024 07:11:32 -0700 (PDT) Received: from localhost (ool-ad039216.dyn.optonline.net. [173.3.146.22]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b61ba77f24sm9089616d6.81.2024.07.09.07.11.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 07:11:31 -0700 (PDT) Date: Tue, 9 Jul 2024 17:11:30 +0300 From: Efraim Flashner To: Philip McGrath Subject: Re: [bug#71203] [PATCH v2 0/3] gnu: racket: Update to 8.13. Message-ID: Mail-Followup-To: Efraim Flashner , Philip McGrath , 71203-done@debbugs.gnu.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="kFwFxNCqUqtXE0J2" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 71203-done Cc: 71203-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --kFwFxNCqUqtXE0J2 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I'm not sure the QA ever picked it up (haven't been watching it closely), but I tested it locally and everything looks good. Patches pushed! On Mon, Jun 17, 2024 at 11:00:08AM -0400, Philip McGrath wrote: > This v2 is just a rebase to try to trigger QA, as Ludo=E2=80=99 suggested > in . >=20 > Philip >=20 >=20 > Philip McGrath (3): > gnu: zuo: Update to 1.10. > gnu: racket: Update to 8.13. > gnu: chez-scheme: Backport test fix. >=20 > gnu/local.mk | 2 +- > gnu/packages/chez.scm | 5 +- > .../patches/chez-scheme-backport-signal.patch | 87 ++++ > .../racket-backport-8.12-chez-configure.patch | 423 ------------------ > gnu/packages/racket.scm | 49 +- > 5 files changed, 114 insertions(+), 452 deletions(-) > create mode 100644 gnu/packages/patches/chez-scheme-backport-signal.patch > delete mode 100644 gnu/packages/patches/racket-backport-8.12-chez-config= ure.patch >=20 >=20 > base-commit: f9ed5788fda9288301550c641820d422e9ad1602 > --=20 > 2.45.1 >=20 >=20 >=20 >=20 --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --kFwFxNCqUqtXE0J2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmaNRQgACgkQQarn3Mo9 g1G1Rg//Zoox2N9cwFanVagMwaixavR/BIeSLBqlhVU4tQnj6A02TstRb8As2HAc PX1FBYSbLlhBvCgyUXPveagpYMjsI40GzJ32dZkkQtNzpMOtEMZcbwJp8Fsfxygg sJIEwEPPEkMdZjZTHiKqOXIH71NQQUay//T/9oSH9zZ4fKTMuw5eZMQtvPmEi4F/ Zd3recI94ps23xFdI1q/iHq6auiyAiGeB6vb4+eIkl4ysWATIK9EXO1MJYzmIpjT fyoq0rshKMwhKZk3zUXn0nlBB3z3vpPlHYSGDx0CKhNgGxk3CtttNHsT2j/u857q WeAoZq1FqMbxYlaYPzA0CMsFqd/xpHhkH6XXLH6KtUvf8LdrX773UH7sFFLtuPx0 y2ktF15/UCKSQ0Q3qCCPDGHiU6Az5RvORBGaBVi2HnWL1pobzhbr6je/CbbtRBkT JacZ9X/gvoEE/ABPzilCakT3nzW7ONFriLZwVxFr/OLMyznxS2hq23IN2axYZAy/ ITAu5+dpwf85DvRfaIXqOc3K8XAJx7sHgCfNwUxEqLb2yv7nh2zhC/BBmVyE7p/A 5GZbiz6CXOyBAxliP5TEI9Tp5Xe7HeJ+UYiMaKO+G8AaBbj6Blh6EB/037u0bSGy FouiZPbTDRyZ9iJ0N0mrLzDq5fUSrb3PgqtxiOSs7bP97V3jmpE= =YpId -----END PGP SIGNATURE----- --kFwFxNCqUqtXE0J2-- From unknown Fri Aug 15 14:18:09 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 07 Aug 2024 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator