From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id OKGPBQtZdWNVSAEAbAwnHQ (envelope-from ) for ; Wed, 16 Nov 2022 22:41:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SNmhBQtZdWOWKgAAauVa8A (envelope-from ) for ; Wed, 16 Nov 2022 22:41:31 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7071B27CD3 for ; Wed, 16 Nov 2022 22:41:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovQ9f-00036E-Eq; Wed, 16 Nov 2022 16:41:11 -0500 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 1ovQ9Y-00035Z-Ar for guix-patches@gnu.org; Wed, 16 Nov 2022 16:41:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovQ9W-0000Ib-Q3 for guix-patches@gnu.org; Wed, 16 Nov 2022 16:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovQ9W-0002oZ-FW for guix-patches@gnu.org; Wed, 16 Nov 2022 16:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59322] [PATCH 1/2] gnu: racket: Update to 8.7. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Nov 2022 21:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59322 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59322@debbugs.gnu.org Cc: Philip McGrath Received: via spool by 59322-submit@debbugs.gnu.org id=B59322.166863482210736 (code B ref 59322); Wed, 16 Nov 2022 21:41:02 +0000 Received: (at 59322) by debbugs.gnu.org; 16 Nov 2022 21:40:22 +0000 Received: from localhost ([127.0.0.1]:58349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovQ8d-0002mY-6v for submit@debbugs.gnu.org; Wed, 16 Nov 2022 16:40:21 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:55259) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovQ8U-0002lo-Hv for 59322@debbugs.gnu.org; Wed, 16 Nov 2022 16:40:05 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 590205C01F1; Wed, 16 Nov 2022 16:39:53 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 16 Nov 2022 16:39:53 -0500 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:sender:subject :subject:to:to; s=fm1; t=1668634793; x=1668721193; bh=ipK0yXDB8y FoM2sWocE6U7g/c5CV0qCGQ24QXTPlH1o=; b=ie0p41UTgRCBkAZFbhEH07xqJG TSanxAZIREGOOR2/CKjBBGoY8qwJA1xzsLiQpMFAyi2qVH3Aqug7W2ShrCE/Hm6f pUT7k9az3rL6nVSJp0TxnfvVnXjp6yt2E+HgI8IPc0j+H5LpJ78lgfj4baPO/Fxw JjzDo5ksJzztRvlsRtkTTD4pYLSardx3tnLZAl3YGBlNNOvWgBt3RK5kSmy2EvLE 6eKvI7ED7wgv8L6+AE+gdFl+BQS6noiP1aruRJbhFjhSA13sMgyp7R14b0790gg3 MNh9PVp/SPuooCsYtTVB+k3TQBuYiX6wDyXy5niiGNgjk0zF0+NZkel5SI+g== 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:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1668634793; x= 1668721193; bh=ipK0yXDB8yFoM2sWocE6U7g/c5CV0qCGQ24QXTPlH1o=; b=T OkfEvF8kkvUrygekODrwbQaeXcrzBqxONJ1Nul0jQ8XsE+fK2RsKBXLGp+ijf8f1 CDifjO66ZvWs+hxRi6q25780OZ4EXPoaHsFkwGSK52+qEMJ6goGMH3NWRBignRw1 gdNiybuximUlo0+Bq4j0josmd8WgDnlmAhoG9417aBb1QfBe5B0TYTumyWDbVV4c Xxs43CF5wQiENZJZVn6kkuaQpuYqIgMC5KfkSuvCQVy8wo6/uYDWJQnjOBxWdTk6 Hx4R+8fETAab6rQNIXL4VCARKkHYjuS1blsuIitlyVnzK3/NqzYSRJWYDwpJP1oz YTIvUgVv1RG1ndsL+/s9w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrgeeigdduheduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomheprfhhihhlihhpucfotgfirhgrthhhuceophhhihhlihhp sehphhhilhhiphhmtghgrhgrthhhrdgtohhmqeenucggtffrrghtthgvrhhnpeffhfdvud dvteevtdelveeugfelvedvgfefteekffeljefgieekjeekffeuvdelueenucffohhmrghi nhepghhithhhuhgsrdgtohhmpdhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehphhhilhhiphhmtghgrhgr thhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 16 Nov 2022 16:39:52 -0500 (EST) From: Philip McGrath Date: Wed, 16 Nov 2022 16:39:28 -0500 Message-Id: <4572a52575c06039b7fc91672e18bc1aebe951eb.1668634501.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668634890; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ipK0yXDB8yFoM2sWocE6U7g/c5CV0qCGQ24QXTPlH1o=; b=uG+APjXuL68vkv7hx/VqW9EnY2uKcsfTF/tAgsP/b9RGlAO6IXuMISicY80rXiNlFzKl7B 9y0AxX5CoYp71IGe90wDc9kqRmaqcCSIHNsZn0TKd6fmxYxRRHVhCmtm2YoTBqV8WSngL6 FKncED06XCpLVwqEpSX0fPtUkFTD1gBwsUXIgUqIziFzpEsJLCOhPT28P+vsl22+1TECZA srqgN835izRpAyAQp3oFkn2T3IvghwHexCPcYND30SrV+kJRO1+STRUjW4KRuhRHKSAL+g 7fxDie52RgfG1TW+QJoLWWasJXk/+wF2bUuUGUhlX0fDF9v4KT3/gbAcubLs/A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668634890; a=rsa-sha256; cv=none; b=fJzP5+s9HGfFj/oG6b3cECumUoX4iaIhUZoNlznx4dbtVmBgIvYnUhEyWEXsd0+KkzZBVv LoEWI6SuabcX8gTt+m22EMtgAuGTNwnKCp3sT85AXpn2emcfaQDnWL541ylLgI+O+AD9dS bFhDruECX131dFxPv9oTnqGM8tqeb/P8yWskXGsEDU+DCZZQWcT+jEMUVrJ7AViU5joqF/ wQrRqRe3Pt96iDIQ50f5qFhOdO1qVTj9HlXcVx4Ei5hPCSyEpOcvV+aqDP8nHi+dgTvhOr m6yzs7vQXmiF7lDv23QPbosOXSLNJvud8lsxU9D2CzpQi1NsN5bE8Y61JAHoMg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=fm1 header.b=ie0p41UT; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="T OkfEvF"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 2.57 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=fm1 header.b=ie0p41UT; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="T OkfEvF"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 7071B27CD3 X-Spam-Score: 2.57 X-Migadu-Scanner: scn0.migadu.com X-TUID: dzs3ay+J1Fwa Also, update 'chez-scheme-for-racket' to 9.5.9.8. * gnu/packages/patches/racket-backport-8.6-cross-install.patch, gnu/packages/patches/racket-backport-8.6-docindex-write.patch, gnu/packages/patches/racket-backport-8.6-hurd.patch, gnu/packages/patches/racket-backport-8.6-zuo.patch: Remove patches. * gnu/packages/patches/racket-backport-8.7-pkg-strip.patch: New patch. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/racket.scm (%racket-origin)[patches]: Likewise. (%racket-version): Update to 8.7. (racket)[inputs]: Add 'scheme-doc' source package from '%racket-origin'. (racket)[inputs]: Update checksums. * gnu/packages/chez.scm (target-chez-arch): Support riscv64-linux-gnu. (%chez-features-table): Likewise. (chez-scheme-for-racket): Update to 9.5.9.8. [arguments]: Enable tests. [description]: Update. (chez-scheme-for-racket-bootstrap-bootfiles)[arguments]: Update path to 'rktboot'. --- gnu/local.mk | 2 +- gnu/packages/chez.scm | 21 +- .../racket-backport-8.6-cross-install.patch | 126 ---- .../racket-backport-8.6-docindex-write.patch | 36 -- .../patches/racket-backport-8.6-hurd.patch | 609 ------------------ .../patches/racket-backport-8.6-zuo.patch | 481 -------------- .../racket-backport-8.7-pkg-strip.patch | 90 +++ gnu/packages/racket.scm | 54 +- 8 files changed, 126 insertions(+), 1293 deletions(-) delete mode 100644 gnu/packages/patches/racket-backport-8.6-cross-install.patch delete mode 100644 gnu/packages/patches/racket-backport-8.6-docindex-write.patch delete mode 100644 gnu/packages/patches/racket-backport-8.6-hurd.patch delete mode 100644 gnu/packages/patches/racket-backport-8.6-zuo.patch create mode 100644 gnu/packages/patches/racket-backport-8.7-pkg-strip.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4fcaa6801a..8441fc6ad5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1796,7 +1796,7 @@ dist_patch_DATA = \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rtags-separate-rct.patch \ - %D%/packages/patches/racket-backport-8.6-zuo.patch \ + %D%/packages/patches/racket-backport-8.7-pkg-strip.patch \ %D%/packages/patches/racket-chez-scheme-bin-sh.patch \ %D%/packages/patches/racket-rktio-bin-sh.patch \ %D%/packages/patches/racket-zuo-bin-sh.patch \ diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 5d152b3db5..0d22e2e20f 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -104,7 +104,7 @@ (define* (target-chez-arch #:optional (system ((target-ppc32? system) "ppc32") ((target-riscv64? system) - #f) + "rv64") (else #f))) @@ -170,6 +170,7 @@ (define %chez-features-table ("a6" threads bootstrap-bootfiles) ("arm32" bootstrap-bootfiles) ("arm64" . #f) + ("rv64" . #f) ("ppc32" threads)) ;; Hurd ("gnu" @@ -466,8 +467,8 @@ (define-public chez-scheme-for-racket (package (inherit chez-scheme) (name "chez-scheme-for-racket") - (version "9.5.9.2") - ;; The version should match `(scheme-fork-version-number)`. + (version "9.5.9.8") + ;; The version should match `scheme-version`. ;; See racket/src/ChezScheme/s/cmacros.ss c. line 360. ;; It will always be different than the upstream version! ;; When updating, remember to also update %racket-version in racket.scm. @@ -492,12 +493,6 @@ (define-public chez-scheme-for-racket (substitute-keyword-arguments (package-arguments chez-scheme) ((#:out-of-source? _ #f) #t) - ((#:tests? _ #t) - ;; FIXME: There have been some flaky test failures. Some have been - ;; fixed upstream post-release but have proven non-trivial to - ;; backport; at least one issue remains. Re-enable tests once - ;; https://github.com/racket/racket/issues/4359 is fixed. - #f) ((#:configure-flags cfg-flags #~'()) #~`("--disable-x11" "--threads" ;; ok to potentially duplicate @@ -590,7 +585,7 @@ (define-public chez-scheme-for-racket Main additions to Chez Scheme in the Racket variant: @itemize @bullet @item -AArch64 code generation +AArch64 and RV64G (RISC-V) code generation @item Portable bytecode (@code{pb}) mode, which is mainly useful for bootstrapping a build on any platform, but can also be used on platforms without native-code @@ -603,7 +598,7 @@ (define-public chez-scheme-for-racket @item Type reconstruction during optimization (especially for safe code) @item -Continuation attachments +Continuation marks @item Parallel garbage collection, in-place garbage collection for old-generation objects (instead of always copying), and reachability-based memory @@ -611,6 +606,8 @@ (define-public chez-scheme-for-racket @item Ordered finalization, immobile (but collectable) objects, weak/ephemeron generic hash tables, and reference bytevectors +@item +Easier bootstrapping via old versions of Chez Scheme @end itemize") (license asl2.0))) @@ -695,7 +692,7 @@ (define-public chez-scheme-for-racket-bootstrap-bootfiles #~(invoke (search-input-file (or native-inputs inputs) "/opt/racket-vm/bin/racket") - "rktboot/main.rkt" + "../rktboot/main.rkt" #$@(if (racket-cs-native-supported-system?) #~() (let ((m (nix-system->pbarch-machine-type))) diff --git a/gnu/packages/patches/racket-backport-8.6-cross-install.patch b/gnu/packages/patches/racket-backport-8.6-cross-install.patch deleted file mode 100644 index 2c4d8924ed..0000000000 --- a/gnu/packages/patches/racket-backport-8.6-cross-install.patch +++ /dev/null @@ -1,126 +0,0 @@ -From fbe2094f56fb81c888076c781e90fb0abbc0cc07 Mon Sep 17 00:00:00 2001 -From: Matthew Flatt -Date: Sat, 30 Jul 2022 07:06:55 -0600 -Subject: [PATCH 1/2] CS makefiles: fix Unix-style install for cross - compilation - -Closes #4377 - -(cherry picked from commit 053be470e7c5454cdf48e934f3254d2d916bbbc5) ---- - racket/src/cs/c/build.zuo | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/racket/src/cs/c/build.zuo b/racket/src/cs/c/build.zuo -index 8d3950bb27..d8b74c509d 100644 ---- a/racket/src/cs/c/build.zuo -+++ b/racket/src/cs/c/build.zuo -@@ -1016,10 +1016,9 @@ - (define (setup) - (call-with-dest-racket - (lambda (bindir dest-racket) -- (define copytree-racket (and cross? (config-bootstrap-racket))) -+ (define copytree-racket (and cross? (hash-ref (config-bootstrap-racket) 'racket))) - (maybe-copytree config dest-racket copytree-racket at-dir) -- (run-raco-setup config dest-racket -- (and cross? (hash-ref (config-bootstrap-racket) 'racket)) -+ (run-raco-setup config dest-racket copytree-racket - ;; this can be redundant if it's also supplied via `SETUP_MACHINE_FLAGS`, - ;; but redundant should be ok: - (list "-MCR" (~a (at-dir "compiled") ":") --- -2.32.0 - - -From 85802f4d515e310e657928707800ad709a676e2a Mon Sep 17 00:00:00 2001 -From: Matthew Flatt -Date: Mon, 15 Aug 2022 10:37:01 +0800 -Subject: [PATCH 2/2] configure: adjust cross-build assumption for a pb build - -Don't assume a cross build for a pb target on a platform that's only -supported via pb. - -(cherry picked from commit 70e484e885637c495be5481983dae2207fdd67bb) - -(Edited to remove unrelated tweak to comments in -"racket/src/expander/expand/require+provide.rkt".) ---- - racket/src/cs/c/configure | 15 +++++++++++---- - racket/src/cs/c/configure.ac | 15 +++++++++++---- - 2 files changed, 22 insertions(+), 8 deletions(-) - -diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure -index 454d79e11a..7e0fa5600d 100755 ---- a/racket/src/cs/c/configure -+++ b/racket/src/cs/c/configure -@@ -4679,6 +4679,11 @@ case "$MACH_HOST_CPU" in - ;; - esac - -+if test "${MACH}" = "" ; then -+ default_mach_was_empty=yes -+else -+ default_mach_was_empty=no -+fi - - if test "${enable_mach}" != "" ; then - MACH="${enable_mach}" -@@ -4701,13 +4706,15 @@ elif test "$MACH" = "" -o "$MACH_OS" = "" ; then - exit 1 - fi - --# For a pb build where Racket is supplied, force cross-build --# mode on the assumption that the host is not a pb build --# (because it should be created with default configure options) -+# For a pb build where Racket is supplied and MACH was not originally -+# empty, force cross-build mode on the assumption that the host is not -+# a pb build (because it should be created with default configure options) - if test "${enable_pb}" = "yes" ; then - if test "${enable_racket}" != "" ; then - if test "${enable_target}" = "" ; then -- enable_target="${MACH}" -+ if test "${default_mach_was_empty}" = "no" ; then -+ enable_target="${MACH}" -+ fi - fi - fi - fi -diff --git a/racket/src/cs/c/configure.ac b/racket/src/cs/c/configure.ac -index 5bce979c92..734c1e8feb 100644 ---- a/racket/src/cs/c/configure.ac -+++ b/racket/src/cs/c/configure.ac -@@ -415,6 +415,11 @@ case "$MACH_HOST_CPU" in - ;; - esac - -+if test "${MACH}" = "" ; then -+ default_mach_was_empty=yes -+else -+ default_mach_was_empty=no -+fi - - if test "${enable_mach}" != "" ; then - MACH="${enable_mach}" -@@ -437,13 +442,15 @@ elif test "$MACH" = "" -o "$MACH_OS" = "" ; then - exit 1 - fi - --# For a pb build where Racket is supplied, force cross-build --# mode on the assumption that the host is not a pb build --# (because it should be created with default configure options) -+# For a pb build where Racket is supplied and MACH was not originally -+# empty, force cross-build mode on the assumption that the host is not -+# a pb build (because it should be created with default configure options) - if test "${enable_pb}" = "yes" ; then - if test "${enable_racket}" != "" ; then - if test "${enable_target}" = "" ; then -- enable_target="${MACH}" -+ if test "${default_mach_was_empty}" = "no" ; then -+ enable_target="${MACH}" -+ fi - fi - fi - fi --- -2.32.0 - diff --git a/gnu/packages/patches/racket-backport-8.6-docindex-write.patch b/gnu/packages/patches/racket-backport-8.6-docindex-write.patch deleted file mode 100644 index abe1984507..0000000000 --- a/gnu/packages/patches/racket-backport-8.6-docindex-write.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8b4d686a62fd66dedfc40ecdcf3698316993d614 Mon Sep 17 00:00:00 2001 -From: Philip McGrath -Date: Sun, 17 Jul 2022 22:51:44 -0400 -Subject: [PATCH] racket-index: set write permission when copying - `docindex.sqlite` - -Fixes https://github.com/racket/racket/issues/4357 - -(cherry picked from commit 55b6cbdca1f36a4f37bab1519c1b658717d3cad2) ---- - pkgs/racket-index/setup/scribble.rkt | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/pkgs/racket-index/setup/scribble.rkt b/pkgs/racket-index/setup/scribble.rkt -index 6694f0b793..e27a8fa348 100644 ---- a/pkgs/racket-index/setup/scribble.rkt -+++ b/pkgs/racket-index/setup/scribble.rkt -@@ -252,7 +252,14 @@ - (unless (file-exists? db-file) - (define-values (base name dir?) (split-path db-file)) - (make-directory* base) -- (when copy-from (copy-file copy-from db-file)) -+ (when copy-from -+ (copy-file copy-from db-file) -+ ;; we might not have write permissions for the previous layer: -+ ;; ensure that we do for the new file -+ (define orig-mode (file-or-directory-permissions db-file 'bits)) -+ (define writeable-mode (bitwise-ior user-write-bit orig-mode)) -+ (unless (= writeable-mode orig-mode) -+ (file-or-directory-permissions db-file writeable-mode))) - (doc-db-disconnect - (doc-db-file->connection db-file #t)))) - (when (or (ormap can-build*? main-docs) --- -2.32.0 - diff --git a/gnu/packages/patches/racket-backport-8.6-hurd.patch b/gnu/packages/patches/racket-backport-8.6-hurd.patch deleted file mode 100644 index d593b01e62..0000000000 --- a/gnu/packages/patches/racket-backport-8.6-hurd.patch +++ /dev/null @@ -1,609 +0,0 @@ -From f17b030fa2f902bb3666913d4a3cd6ba9c146d22 Mon Sep 17 00:00:00 2001 -From: Philip McGrath -Date: Wed, 3 Aug 2022 03:13:03 -0400 -Subject: [PATCH 1/3] Chez Scheme: Fix build on GNU/Hurd - -Mostly GNU/Hurd should take the same options as GNU/Linux. One -difference is that the Hurd does not define macros such as `PATH_MAX` or -`NOFILE`, because it avoids imposing arbitrary limits on such resources. -This patch provides alternatives for localized uses of those constants, -but it accepts the pervasive use of `PATH_MAX` in finding bootfiles for -now. See https://www.gnu.org/software/hurd/hurd/porting/guidelines.html. - -(cherry picked from commit 87eee6e2adb8c6bc11e60619c706fa6295096085) ---- - racket/src/ChezScheme/README.md | 1 + - racket/src/ChezScheme/c/number.c | 22 +++++++++---------- - racket/src/ChezScheme/c/prim5.c | 35 ++++++++++++++++++++++++++++-- - racket/src/ChezScheme/c/scheme.c | 34 +++++++++++++++++------------ - racket/src/ChezScheme/c/version.h | 7 ++++-- - racket/src/ChezScheme/configure | 17 ++++++++++----- - racket/src/ChezScheme/s/cmacros.ss | 1 + - racket/src/cs/c/configure | 14 ++++++++++-- - racket/src/cs/c/configure.ac | 14 ++++++++++-- - racket/src/cs/rumble/system.ss | 3 +++ - 10 files changed, 109 insertions(+), 39 deletions(-) - -diff --git a/racket/src/ChezScheme/README.md b/racket/src/ChezScheme/README.md -index a4a11a5eef..25231dd9bb 100644 ---- a/racket/src/ChezScheme/README.md -+++ b/racket/src/ChezScheme/README.md -@@ -13,6 +13,7 @@ Supported platforms (bytecode interpreter may work for others): - * OpenBSD: x86, x86_64, ARMv6, AArch64, PowerPC32 - * NetBSD: x86, x86_64, ARMv6, AArch64, PowerPC32 - * Solaris: x86, x86_64 -+ * GNU/Hurd: x86 - * Android: ARMv7, AArch64 - * iOS: AArch64 - * WebAssembly via Emscripten (bytecode interpreter only) -diff --git a/racket/src/ChezScheme/c/number.c b/racket/src/ChezScheme/c/number.c -index ede38cc626..e2bce0d2d3 100644 ---- a/racket/src/ChezScheme/c/number.c -+++ b/racket/src/ChezScheme/c/number.c -@@ -1041,15 +1041,15 @@ floating-point operations - - #ifdef IEEE_DOUBLE - /* exponent stored + 1024, hidden bit to left of decimal point */ --#define bias 1023 --#define bitstoright 52 --#define m1mask 0xf --#ifdef WIN32 --#define hidden_bit 0x10000000000000 --#else --#define hidden_bit 0x10000000000000ULL --#endif --#ifdef LITTLE_ENDIAN_IEEE_DOUBLE -+# define bias 1023 -+# define bitstoright 52 -+# define m1mask 0xf -+# ifdef WIN32 -+# define hidden_bit 0x10000000000000 -+# else -+# define hidden_bit 0x10000000000000ULL -+# endif -+# ifdef LITTLE_ENDIAN_IEEE_DOUBLE - struct dblflt { - UINT m4: 16; - UINT m3: 16; -@@ -1058,7 +1058,7 @@ struct dblflt { - UINT e: 11; - UINT sign: 1; - }; --#else -+# else - struct dblflt { - UINT sign: 1; - UINT e: 11; -@@ -1067,7 +1067,7 @@ struct dblflt { - UINT m3: 16; - UINT m4: 16; - }; --#endif -+# endif - #endif - - double S_random_double(U32 m1, U32 m2, U32 m3, U32 m4, double scale) { -diff --git a/racket/src/ChezScheme/c/prim5.c b/racket/src/ChezScheme/c/prim5.c -index 124d1e049c..82bbf8d687 100644 ---- a/racket/src/ChezScheme/c/prim5.c -+++ b/racket/src/ChezScheme/c/prim5.c -@@ -23,6 +23,10 @@ - #include - #include - -+#if defined(__GNU__) /* Hurd */ -+#include -+#endif -+ - /* locally defined functions */ - static INT s_errno(void); - static IBOOL s_addr_in_heap(uptr x); -@@ -58,7 +62,7 @@ static void s_showalloc(IBOOL show_dump, const char *outfn); - static ptr s_system(const char *s); - static ptr s_process(char *s, IBOOL stderrp); - static I32 s_chdir(const char *inpath); --#ifdef GETWD -+#if defined(GETWD) || defined(__GNU__) /* Hurd */ - static char *s_getwd(void); - #endif - static ptr s_set_code_byte(ptr p, ptr n, ptr x); -@@ -881,7 +885,18 @@ static ptr s_process(char *s, IBOOL stderrp) { - CLOSE(0); if (dup(tofds[0]) != 0) _exit(1); - CLOSE(1); if (dup(fromfds[1]) != 1) _exit(1); - CLOSE(2); if (dup(stderrp ? errfds[1] : 1) != 2) _exit(1); -+#ifndef __GNU__ /* Hurd */ - {INT i; for (i = 3; i < NOFILE; i++) (void)CLOSE(i);} -+#else /* __GNU__ Hurd: no NOFILE */ -+ { -+ INT i; -+ struct rlimit rlim; -+ getrlimit(RLIMIT_NOFILE, &rlim); -+ for (i = 3; i < rlim.rlim_cur; i++) { -+ (void)CLOSE(i); -+ } -+ } -+#endif /* __GNU__ Hurd */ - execl("/bin/sh", "/bin/sh", "-c", s, NULL); - _exit(1) /* only if execl fails */; - /*NOTREACHED*/ -@@ -927,6 +942,22 @@ static I32 s_chdir(const char *inpath) { - static char *s_getwd() { - return GETWD(TO_VOIDP(&BVIT(S_bytevector(PATH_MAX), 0))); - } -+#elif defined(__GNU__) /* Hurd: no PATH_MAX */ -+static char *s_getwd() { -+ char *path; -+ size_t len; -+ ptr bv; -+ path = getcwd(NULL, 0); -+ if (NULL == path) { -+ return NULL; -+ } else { -+ len = strlen(path); -+ bv = S_bytevector(len); -+ memcpy(TO_VOIDP(&BVIT(bv, 0)), path, len); -+ free(path); -+ return TO_VOIDP(&BVIT(bv, 0)); -+ } -+} - #endif /* GETWD */ - - static ptr s_set_code_byte(ptr p, ptr n, ptr x) { -@@ -1817,7 +1848,7 @@ void S_prim5_init(void) { - Sforeign_symbol("(cs)s_rational", (void *)S_rational); - Sforeign_symbol("(cs)sub", (void *)S_sub); - Sforeign_symbol("(cs)rem", (void *)S_rem); --#ifdef GETWD -+#if defined(GETWD) || defined(__GNU__) /* Hurd */ - Sforeign_symbol("(cs)s_getwd", (void *)s_getwd); - #endif - Sforeign_symbol("(cs)s_chdir", (void *)s_chdir); -diff --git a/racket/src/ChezScheme/c/scheme.c b/racket/src/ChezScheme/c/scheme.c -index ed5564540b..0c40e3eaf0 100644 ---- a/racket/src/ChezScheme/c/scheme.c -+++ b/racket/src/ChezScheme/c/scheme.c -@@ -458,6 +458,12 @@ static IBOOL next_path(char *path, const char *name, const char *ext, const char - static const char *path_last(const char *path); - static char *get_defaultheapdirs(void); - -+#ifdef PATH_MAX -+# define BOOT_PATH_MAX PATH_MAX -+#else /* hack for Hurd: better to remove the restriction */ -+# define BOOT_PATH_MAX 4096 -+#endif -+ - static const char *path_last(const char *p) { - const char *s; - #ifdef WIN32 -@@ -483,7 +489,7 @@ static const char *path_last(const char *p) { - - static char *get_defaultheapdirs() { - char *result; -- wchar_t buf[PATH_MAX]; -+ wchar_t buf[BOOT_PATH_MAX]; - DWORD len = sizeof(buf); - if (ERROR_SUCCESS != RegGetValueW(HKEY_LOCAL_MACHINE, L"Software\\Chez Scheme\\csv" VERSION, L"HeapSearchPath", RRF_RT_REG_SZ, NULL, buf, &len)) - return DEFAULT_HEAP_PATH; -@@ -512,14 +518,14 @@ static char *get_defaultheapdirs() { - * leaving the full path with name affixed in path and *sp / *dsp pointing - * past the current entry. it returns 1 on success and 0 if at the end of - * the search path. path should be a pointer to an unoccupied buffer -- * PATH_MAX characters long. either or both of sp/dsp may be empty, -+ * BOOT_PATH_MAX characters long. either or both of sp/dsp may be empty, - * but neither may be null, i.e., (char *)0. */ - static IBOOL next_path(char *path, const char *name, const char *ext, - const char **sp, const char **dsp) { - char *p; - const char *s, *t; - --#define setp(c) if (p >= path + PATH_MAX) { fprintf(stderr, "search path entry too long\n"); S_abnormal_exit(); } else *p++ = (c) -+#define setp(c) if (p >= path + BOOT_PATH_MAX) { fprintf(stderr, "search path entry too long\n"); S_abnormal_exit(); } else *p++ = (c) - for (;;) { - s = *sp; - p = path; -@@ -532,10 +538,10 @@ static IBOOL next_path(char *path, const char *name, const char *ext, - switch (*s) { - #ifdef WIN32 - case 'x': { -- wchar_t exepath[PATH_MAX]; DWORD n; -+ wchar_t exepath[BOOT_PATH_MAX]; DWORD n; - s += 1; -- n = GetModuleFileNameW(NULL, exepath, PATH_MAX); -- if (n == 0 || (n == PATH_MAX && GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { -+ n = GetModuleFileNameW(NULL, exepath, BOOT_PATH_MAX); -+ if (n == 0 || (n == BOOT_PATH_MAX && GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { - fprintf(stderr, "warning: executable path is too long; ignoring %%x\n"); - } else { - char *tstart; -@@ -608,7 +614,7 @@ typedef struct { - iptr len; /* 0 => unknown */ - iptr offset; - IBOOL need_check, close_after; -- char path[PATH_MAX]; -+ char path[BOOT_PATH_MAX]; - } boot_desc; - - #define MAX_BOOT_FILES 10 -@@ -695,14 +701,14 @@ static void finish_dependencies_header(int fd, const char *path, int c) { - static IBOOL find_boot(const char *name, const char *ext, IBOOL direct_pathp, - int fd, - IBOOL errorp) { -- char pathbuf[PATH_MAX], buf[PATH_MAX]; -+ char pathbuf[BOOT_PATH_MAX], buf[BOOT_PATH_MAX]; - uptr n = 0; - INT c; - const char *path; - char *expandedpath; - - if ((fd != -1) || direct_pathp || S_fixedpathp(name)) { -- if (strlen(name) >= PATH_MAX) { -+ if (strlen(name) >= BOOT_PATH_MAX) { - fprintf(stderr, "boot-file path is too long %s\n", name); - S_abnormal_exit(); - } -@@ -776,7 +782,7 @@ static IBOOL find_boot(const char *name, const char *ext, IBOOL direct_pathp, - if (boot_count == 0) { - for (;;) { - /* try to load heap or boot file this boot file requires */ -- if (get_string(fd, buf, PATH_MAX, &c) != 0) { -+ if (get_string(fd, buf, BOOT_PATH_MAX, &c) != 0) { - fprintf(stderr, "unexpected end of file on %s\n", path); - CLOSE(fd); - S_abnormal_exit(); -@@ -796,7 +802,7 @@ static IBOOL find_boot(const char *name, const char *ext, IBOOL direct_pathp, - c = get_u8(fd); - for (sep = " "; ; sep = "or ") { - if (c == ')') break; -- (void) get_string(fd, buf, PATH_MAX, &c); -+ (void) get_string(fd, buf, BOOT_PATH_MAX, &c); - fprintf(stderr, "%s%s.boot ", sep, buf); - } - fprintf(stderr, "required by %s\n", path); -@@ -1090,7 +1096,7 @@ extern void Sregister_boot_file_fd_region(const char *name, - int close_after) { - check_boot_file_state("Sregister_boot_file_fd"); - -- if (strlen(name) >= PATH_MAX) { -+ if (strlen(name) >= BOOT_PATH_MAX) { - fprintf(stderr, "boot-file path is too long %s\n", name); - S_abnormal_exit(); - } -@@ -1141,14 +1147,14 @@ extern void Sbuild_heap(const char *kernel, void (*custom_init)(void)) { - } - - name = path_last(kernel); -- if (strlen(name) >= PATH_MAX) { -+ if (strlen(name) >= BOOT_PATH_MAX) { - fprintf(stderr, "executable name too long: %s\n", name); - S_abnormal_exit(); - } - - #ifdef WIN32 - { /* strip off trailing .exe, if any */ -- static char buf[PATH_MAX]; -+ static char buf[BOOT_PATH_MAX]; - iptr n; - - n = strlen(name) - 4; -diff --git a/racket/src/ChezScheme/c/version.h b/racket/src/ChezScheme/c/version.h -index a79d12621b..61751a9fad 100644 ---- a/racket/src/ChezScheme/c/version.h -+++ b/racket/src/ChezScheme/c/version.h -@@ -80,7 +80,7 @@ FORCEINLINE void store_unaligned_uptr(uptr *addr, uptr val) { - /*****************************************/ - /* Operating systems */ - --#if defined(__linux__) -+#if defined(__linux__) || defined(__GNU__) /* Hurd */ - #define NOBLOCK O_NONBLOCK - #define LOAD_SHARED_OBJECT - #define USE_MMAP -@@ -91,7 +91,10 @@ FORCEINLINE void store_unaligned_uptr(uptr *addr, uptr val) { - #define GETPAGESIZE() getpagesize() - typedef char *memcpy_t; - #define MAKE_NAN(x) { x = 0.0; x = x / x; } --#define GETWD(x) getcwd((x),PATH_MAX) -+#ifndef __GNU__ /* Hurd: no PATH_MAX */ -+/* n.b. don't test PATH_MAX directly: we have not yet included */ -+# define GETWD(x) getcwd((x),PATH_MAX) -+#endif - typedef int tputsputcchar; - #ifndef __ANDROID__ - # define LOCKF -diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure -index f64b639c3a..efdb6029cb 100755 ---- a/racket/src/ChezScheme/configure -+++ b/racket/src/ChezScheme/configure -@@ -102,6 +102,11 @@ case "${CONFIG_UNAME}" in - installprefix=/usr - installmansuffix=share/man - ;; -+ GNU) -+ unixsuffix=gnu # the Hurd -+ installprefix=/usr -+ installmansuffix=share/man -+ ;; - QNX) - if uname -a | egrep 'x86' > /dev/null 2>&1 ; then - m32=i3qnx -@@ -591,7 +596,7 @@ fi - - # Infer flags needed for threads: - case "${flagsm}" in -- *le|*fb|*ob|*nb) -+ *le|*gnu|*fb|*ob|*nb) - threadFlags="-D_REENTRANT -pthread" - threadLibs="-lpthread" - ;; -@@ -627,7 +632,7 @@ if [ "$cflagsset" = "no" ] ; then - a6*) - CFLAGS="-m64 ${optFlags}" - ;; -- i3le) -+ i3le) # intentionally not including i3gnu, which may not support sse2 - CFLAGS="-m32 -msse2 -mfpmath=sse ${optFlags}" - ;; - i3nt) -@@ -688,7 +693,7 @@ fi - # Add automatic linking flags, unless suppressed by --disable-auto-flags - if [ "$addflags" = "yes" ] ; then - case "${flagsm}" in -- *le) -+ *le|*gnu) - LDFLAGS="${LDFLAGS} -rdynamic" - ;; - *fb|*nb) -@@ -702,7 +707,7 @@ if [ "$addflags" = "yes" ] ; then - esac - - case "${flagsm}" in -- *le) -+ *le|*gnu) - LIBS="${LIBS} -lm -ldl ${ncursesLib} -lrt" - ;; - *fb|*ob) -@@ -749,7 +754,7 @@ exeSuffix= - - # compile flags for c/Mf-unix and mats/Mf-unix - case "${flagsmuni}" in -- *le) -+ *le|*gnu) - mdcflags="-fPIC -shared" - ;; - *fb|*ob) -@@ -781,7 +786,7 @@ case "${flagsmuni}" in - i3le) - mdldflags="-melf_i386" - ;; -- *le) -+ *le|*gnu) - ;; - i3nb) - mdldflags="-m elf_i386" -diff --git a/racket/src/ChezScheme/s/cmacros.ss b/racket/src/ChezScheme/s/cmacros.ss -index ff2b09217b..2e79a4d8de 100644 ---- a/racket/src/ChezScheme/s/cmacros.ss -+++ b/racket/src/ChezScheme/s/cmacros.ss -@@ -385,6 +385,7 @@ - i3fb ti3fb - i3ob ti3ob - i3osx ti3osx -+ i3gnu ti3gnu - a6le ta6le - a6osx ta6osx - a6ob ta6ob -diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure -index 454d79e11a..dab545c0b4 100755 ---- a/racket/src/cs/c/configure -+++ b/racket/src/cs/c/configure -@@ -4449,8 +4449,15 @@ case "$host_os" in - ;; - irix*) - ;; -- linux*) -- MACH_OS=le -+ linux*|gnu*) -+ case "$host_os" in -+ *linux*) -+ MACH_OS=le -+ ;; -+ *) -+ MACH_OS=gnu # Hurd -+ ;; -+ esac - case "$host_os" in - *linux-android*) - ;; -@@ -4730,6 +4737,9 @@ if test "${build_os}_${build_cpu}" != "${host_os}_${host_cpu}" ; then - linux*) - BUILD_OS=le - ;; -+ gnu*) # Hurd: must come after linux* -+ BUILD_OS=gnu -+ ;; - *mingw*) - BUILD_OS=nt - ;; -diff --git a/racket/src/cs/c/configure.ac b/racket/src/cs/c/configure.ac -index 5bce979c92..43e7307b1b 100644 ---- a/racket/src/cs/c/configure.ac -+++ b/racket/src/cs/c/configure.ac -@@ -272,8 +272,15 @@ case "$host_os" in - ;; - irix*) - ;; -- linux*) -- MACH_OS=le -+ linux*|gnu*) -+ case "$host_os" in -+ linux*) -+ MACH_OS=le -+ ;; -+ *) -+ MACH_OS=gnu # Hurd -+ ;; -+ esac - case "$host_os" in - *linux-android*) - ;; -@@ -466,6 +473,9 @@ if test "${build_os}_${build_cpu}" != "${host_os}_${host_cpu}" ; then - linux*) - BUILD_OS=le - ;; -+ gnu*) # Hurd - must come after linux* -+ BUILD_OS=gnu -+ ;; - *mingw*) - BUILD_OS=nt - ;; -diff --git a/racket/src/cs/rumble/system.ss b/racket/src/cs/rumble/system.ss -index 2319cbe7a5..773eb79cf3 100644 ---- a/racket/src/cs/rumble/system.ss -+++ b/racket/src/cs/rumble/system.ss -@@ -48,6 +48,8 @@ - arm32le tarm32le arm64le tarm64le - ppc32le tppc32le) - 'linux] -+ [(i3gnu ti3gnu) -+ 'gnu-hurd] - [(a6fb ta6fb i3fb ti3fb - arm32fb tarm32fb arm64fb tarm64fb - ppc32fb tppc32fb) -@@ -85,6 +87,7 @@ - i3nb ti3nb - i3fb ti3fb - i3s2 ti3s2 -+ i3gnu ti3gnu - i3qnx) - 'i386] - [(arm32le tarm32le --- -2.32.0 - - -From 8653294b771c741d320aba31e692b4f0ed0c702f Mon Sep 17 00:00:00 2001 -From: Philip McGrath -Date: Thu, 4 Aug 2022 20:18:09 -0400 -Subject: [PATCH 2/3] BC: Fix build on GNU/Hurd - -(cherry picked from commit 5c05496afd6159c2f9cd52e7f23389fdc6b55f43) ---- - racket/src/bc/configure | 2 +- - racket/src/bc/configure.ac | 2 +- - racket/src/bc/sconfig.h | 14 +++++++++----- - 3 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/racket/src/bc/configure b/racket/src/bc/configure -index 4ddb607b37..4ee346014d 100755 ---- a/racket/src/bc/configure -+++ b/racket/src/bc/configure -@@ -5018,7 +5018,7 @@ case "$host_os" in - X_PRE_LIBS="" - fi - ;; -- linux*) -+ linux*,gnu*) - LIBS="$LIBS -ldl -lm -lrt -rdynamic" - DYN_CFLAGS="-fPIC" - curses_portable_link="/usr/lib/${host_cpu}-${host_os}/libncurses.a /usr/lib/${host_cpu}-${host_os}/libtermcap.a" -diff --git a/racket/src/bc/configure.ac b/racket/src/bc/configure.ac -index deef8f3077..866851236e 100644 ---- a/racket/src/bc/configure.ac -+++ b/racket/src/bc/configure.ac -@@ -557,7 +557,7 @@ case "$host_os" in - X_PRE_LIBS="" - fi - ;; -- linux*) -+ linux*,gnu*) - LIBS="$LIBS -ldl -lm -lrt -rdynamic" - DYN_CFLAGS="-fPIC" - curses_portable_link="/usr/lib/${host_cpu}-${host_os}/libncurses.a /usr/lib/${host_cpu}-${host_os}/libtermcap.a" -diff --git a/racket/src/bc/sconfig.h b/racket/src/bc/sconfig.h -index 01ecb48158..8468942fcd 100644 ---- a/racket/src/bc/sconfig.h -+++ b/racket/src/bc/sconfig.h -@@ -79,12 +79,14 @@ - - #endif - -- /************** Linux with gcc ****************/ -+ /************** Linux (or Hurd) with gcc ****************/ - --#if defined(__linux__) -+#if defined(__linux__) || defined(__GNU__) - - # ifdef __ANDROID__ - # define SCHEME_OS "android" -+# elif defined(__GNU__) -+# define SCHEME_OS "gnu-hurd" - # else - # define SCHEME_OS "linux" - # endif -@@ -146,13 +148,15 @@ - # define USE_IEEE_FP_PREDS - # define USE_EXPLICT_FP_FORM_CHECK - --# define LINUX_FIND_STACK_BASE -+# define LINUX_FIND_STACK_BASE /* also ok for Hurd */ - - # define FLAGS_ALREADY_SET - - #if defined(__i386__) --# define MZ_USE_JIT_I386 --# define MZ_JIT_USE_MPROTECT -+# ifndef __GNU__ /* Hurd */ -+# define MZ_USE_JIT_I386 -+# define MZ_JIT_USE_MPROTECT -+# endif - # ifndef MZ_NO_UNWIND_SUPPORT - # define MZ_USE_DWARF_LIBUNWIND - # endif --- -2.32.0 - - -From 1b0cd08557f58506c96f0ddd855bd9051a45a2f1 Mon Sep 17 00:00:00 2001 -From: Philip McGrath -Date: Sat, 6 Aug 2022 22:48:40 -0400 -Subject: [PATCH 3/3] BC: repair configure script - -Hopefully this will fix the DrDr failures caused by 5c05496. - -Related to https://github.com/racket/racket/pull/4384 - -(cherry picked from commit c3dd01055ed7589a18136904510fe4db557d6e77) ---- - racket/src/bc/configure | 2 +- - racket/src/bc/configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/racket/src/bc/configure b/racket/src/bc/configure -index 4ee346014d..b1c5175b84 100755 ---- a/racket/src/bc/configure -+++ b/racket/src/bc/configure -@@ -5018,7 +5018,7 @@ case "$host_os" in - X_PRE_LIBS="" - fi - ;; -- linux*,gnu*) -+ linux*|gnu*) - LIBS="$LIBS -ldl -lm -lrt -rdynamic" - DYN_CFLAGS="-fPIC" - curses_portable_link="/usr/lib/${host_cpu}-${host_os}/libncurses.a /usr/lib/${host_cpu}-${host_os}/libtermcap.a" -diff --git a/racket/src/bc/configure.ac b/racket/src/bc/configure.ac -index 866851236e..ecc3b0b579 100644 ---- a/racket/src/bc/configure.ac -+++ b/racket/src/bc/configure.ac -@@ -557,7 +557,7 @@ case "$host_os" in - X_PRE_LIBS="" - fi - ;; -- linux*,gnu*) -+ linux*|gnu*) - LIBS="$LIBS -ldl -lm -lrt -rdynamic" - DYN_CFLAGS="-fPIC" - curses_portable_link="/usr/lib/${host_cpu}-${host_os}/libncurses.a /usr/lib/${host_cpu}-${host_os}/libtermcap.a" --- -2.32.0 - diff --git a/gnu/packages/patches/racket-backport-8.6-zuo.patch b/gnu/packages/patches/racket-backport-8.6-zuo.patch deleted file mode 100644 index b86679b7ec..0000000000 --- a/gnu/packages/patches/racket-backport-8.6-zuo.patch +++ /dev/null @@ -1,481 +0,0 @@ -From 8761fc06b188b9ca2f4b7f2b7d1235075c44a321 Mon Sep 17 00:00:00 2001 -From: Matthew Flatt -Date: Sat, 23 Jul 2022 17:10:58 -0600 -Subject: [PATCH 1/4] Zuo: support cross compilation via `configure` and - `CC_FOR_BUILD` - -(cherry picked from commit 798a989ba6d1a30c491a3120b2c2f1570ecab911) ---- - racket/src/zuo/Makefile.in | 7 ++++++- - racket/src/zuo/README.md | 10 ++++++++++ - racket/src/zuo/configure | 15 +++++++++++++++ - racket/src/zuo/configure.ac | 11 +++++++++++ - 4 files changed, 42 insertions(+), 1 deletion(-) - -diff --git a/racket/src/zuo/Makefile.in b/racket/src/zuo/Makefile.in -index 5d16e145bf..747b584c5c 100644 ---- a/racket/src/zuo/Makefile.in -+++ b/racket/src/zuo/Makefile.in -@@ -17,6 +17,11 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ - -+CC_FOR_BUILD = @CC_FOR_BUILD@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ -+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ -+LIBS_FOR_BUILD = @LIBS_FOR_BUILD@ -+ - EMBED_LIBS = @EMBED_LIBS@ - - .PHONY: zuos-to-run-and-install -@@ -24,7 +29,7 @@ zuos-to-run-and-install: zuo - ./zuo . zuos-to-run-and-install - - zuo: $(srcdir)/zuo.c -- $(CC) $(CPPFLAGS) $(CFLAGS) -DZUO_LIB_PATH='"'"$(srcdir)/lib"'"' -o zuo $(srcdir)/zuo.c $(LDFLAGS) $(LIBS) -+ $(CC_FOR_BUILD) $(FLAGS_FOR_BUILD) -DZUO_LIB_PATH='"'"$(srcdir)/lib"'"' -o zuo $(srcdir)/zuo.c $(LDFLAGS_FOR_BUILD) $(LIBS_FOR_BUILD) - - .PHONY: check - check: zuo -diff --git a/racket/src/zuo/README.md b/racket/src/zuo/README.md -index 17c88ee9ec..3aad504b7e 100644 ---- a/racket/src/zuo/README.md -+++ b/racket/src/zuo/README.md -@@ -84,6 +84,16 @@ A boot image is machine-independent, whether in a stand-alone file or - embedded in `.c` source. - - -+Cross Compiling -+--------------- -+ -+If you use `./configure --host=...` to cross compile, then you will -+also need to add something like `CC_FOR_BUILD=cc` as a `./configure` -+argument to specify the compiler for a `zuo` to use on the build -+machine. If necessary, you can also specify `CFLAGS_FOR_BUILD`, -+`LDFLAGS_FOR_BUILD`, and/or `LIBS_FOR_BUILD`. -+ -+ - Embedding Zuo in Another Application - ------------------------------------ - -diff --git a/racket/src/zuo/configure b/racket/src/zuo/configure -index 1fa34a3fe8..575ce07d96 100755 ---- a/racket/src/zuo/configure -+++ b/racket/src/zuo/configure -@@ -589,6 +589,10 @@ enable_embed="zuo" - ac_subst_vars='LTLIBOBJS - LIBOBJS - EMBED_LIBS -+LIBS_FOR_BUILD -+LDFLAGS_FOR_BUILD -+CFLAGS_FOR_BUILD -+CC_FOR_BUILD - OBJEXT - EXEEXT - ac_ct_CC -@@ -2584,6 +2588,17 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -+if test "${CC_FOR_BUILD}" = ""; then -+ CC_FOR_BUILD='$(CC) -O2' -+ CFLAGS_FOR_BUILD='$(CPPFLAGS) $(CFLAGS)' -+ LDFLAGS_FOR_BUILD='$(LDFLAGS)' -+ LIBS_FOR_BUILD='$(LIBS)' -+fi -+ -+ -+ -+ -+ - - { $as_echo "$as_me:${as_lineno-$LINENO}: zuo libraries to embed: \"${EMBED_LIBS}\"" >&5 - $as_echo "$as_me: zuo libraries to embed: \"${EMBED_LIBS}\"" >&6;} -diff --git a/racket/src/zuo/configure.ac b/racket/src/zuo/configure.ac -index 89b3c6391d..598ff79629 100644 ---- a/racket/src/zuo/configure.ac -+++ b/racket/src/zuo/configure.ac -@@ -25,6 +25,17 @@ AS_IF([test "x$enable_embed" = xno], - AC_PROG_MAKE_SET() - AC_PROG_CC - -+if test "${CC_FOR_BUILD}" = ""; then -+ CC_FOR_BUILD='$(CC) -O2' -+ CFLAGS_FOR_BUILD='$(CPPFLAGS) $(CFLAGS)' -+ LDFLAGS_FOR_BUILD='$(LDFLAGS)' -+ LIBS_FOR_BUILD='$(LIBS)' -+fi -+AC_SUBST(CC_FOR_BUILD) -+AC_SUBST(CFLAGS_FOR_BUILD) -+AC_SUBST(LDFLAGS_FOR_BUILD) -+AC_SUBST(LIBS_FOR_BUILD) -+ - AC_SUBST(EMBED_LIBS) - AC_MSG_NOTICE([zuo libraries to embed: "${EMBED_LIBS}"]) - --- -2.32.0 - - -From f65194ea41eb472fbdd45d5f6c13eabe5e681704 Mon Sep 17 00:00:00 2001 -From: Matthew Flatt -Date: Sat, 23 Jul 2022 17:47:03 -0600 -Subject: [PATCH 2/4] Zuo: sort hash keys - -Printing in a sorted order is helpful to make things more -deterministic independent of symbol inputs. Making `hash-keys` -produce a sorted list generalizes that determinism. - -(cherry picked from commit 4e7ffd3b365d01c5d0993c0b3fd24c9623962edf) ---- - racket/src/zuo/build.zuo | 5 ++- - racket/src/zuo/tests/hash.zuo | 8 ++-- - racket/src/zuo/zuo-doc/lang-zuo.scrbl | 18 +++++++-- - racket/src/zuo/zuo.c | 57 ++++++++++++++++++++++++++- - 4 files changed, 78 insertions(+), 10 deletions(-) - -diff --git a/racket/src/zuo/build.zuo b/racket/src/zuo/build.zuo -index c1b5e8ce66..129240120a 100644 ---- a/racket/src/zuo/build.zuo -+++ b/racket/src/zuo/build.zuo -@@ -47,7 +47,10 @@ - (target (at-dir (add-exe name)) - (lambda (path token) - (rule (list image_zuo.c -- (input-data-target 'config config) -+ (input-data-target 'config (cons -+ lib-path -+ (map (lambda (key) (hash-ref config key)) -+ '(CC CPPFLAGS CFLAGS LDFLAGS LIBS)))) - (quote-module-path)) - (lambda () - (define l (split-path path)) -diff --git a/racket/src/zuo/tests/hash.zuo b/racket/src/zuo/tests/hash.zuo -index a35741c730..0d3d7f3af6 100644 ---- a/racket/src/zuo/tests/hash.zuo -+++ b/racket/src/zuo/tests/hash.zuo -@@ -35,9 +35,7 @@ - - (check (hash-keys (hash)) '()) - (check (hash-keys (hash 'a 1)) '(a)) --(check (let ([keys (hash-keys (hash 'a 1 'b 2))]) -- (or (equal? keys '(a b)) -- (equal? keys '(b a))))) -+(check (hash-keys (hash 'a 1 'b 2)) '(a b)) ; always in order - (check (length (hash-keys (hash 'a 1 'b 2 'c 3))) 3) - (check (length (hash-keys (hash 'a 1 'b 2 'a 3))) 2) - (check-arg-fail (hash-keys 0) "not a hash table") -@@ -50,3 +48,7 @@ - (check (hash-keys-subset? (hash 'a 1 'b 2) (hash 'b 1)) #f) - (check-arg-fail (hash-keys-subset? 0 (hash)) "not a hash table") - (check-arg-fail (hash-keys-subset? (hash) 0) "not a hash table") -+ -+;; print sorts keys alphabetically: -+(check (~a (hash 'a 1 'b 2)) "#hash((a . 1) (b . 2))") -+(check (~a (hash 'b 2 'a 1)) "#hash((a . 1) (b . 2))") -diff --git a/racket/src/zuo/zuo-doc/lang-zuo.scrbl b/racket/src/zuo/zuo-doc/lang-zuo.scrbl -index 94641d041e..4605e47471 100644 ---- a/racket/src/zuo/zuo-doc/lang-zuo.scrbl -+++ b/racket/src/zuo/zuo-doc/lang-zuo.scrbl -@@ -538,10 +538,20 @@ support to convert the textual form back into a hash table value. - - Analogous to @realracket*[hash? hash hash-ref hash-set hash-remove - hash-keys hash-count hash-keys-subset?] from @racketmodname[racket]. --Besides being constrained to symbol keys, there is one additional --difference: the third argument to @racket[hash-ref], when supplied, --is always used as a value to return if a key is missing, as --opposed to a failure thunk.} -+ -+Besides being constrained to symbol keys, there are two additional -+differences: -+ -+@itemlist[ -+ -+ @item{the third argument to @racket[hash-ref], when supplied, is -+ always used as a value to return if a key is missing, as -+ opposed to a failure thunk; and} -+ -+ @item{the @racket[hash-keys] function returns interned keys sorted -+ alphabetically.} -+ -+]} - - - @section{Procedures} -diff --git a/racket/src/zuo/zuo.c b/racket/src/zuo/zuo.c -index 2957d478af..88d5747326 100644 ---- a/racket/src/zuo/zuo.c -+++ b/racket/src/zuo/zuo.c -@@ -1298,6 +1298,59 @@ static zuo_t *zuo_trie_keys(zuo_t *trie_in, zuo_t *accum) { - return accum; - } - -+/*======================================================================*/ -+/* symbol-list sorting */ -+/*======================================================================*/ -+ -+/* merge sort used to make hash printing deterministic */ -+static zuo_t *zuo_symbol_list_sort(zuo_t *l_in) { -+ zuo_t *l, *left, *right, *first, *last; -+ zuo_uint_t len = 0, i; -+ -+ for (l = l_in, len = 0; l != z.o_null; l = _zuo_cdr(l)) -+ len++; -+ -+ if (len < 2) -+ return l_in; -+ -+ left = z.o_null; -+ for (l = l_in, i = len >> 1; i > 0; l = _zuo_cdr(l), i--) -+ left = zuo_cons(_zuo_car(l), left); -+ right = l; -+ -+ left = zuo_symbol_list_sort(left); -+ right = zuo_symbol_list_sort(right); -+ -+ first = last = z.o_null; -+ while ((left != z.o_null) && (right != z.o_null)) { -+ zuo_t *p; -+ -+ if (strcmp(ZUO_STRING_PTR(((zuo_symbol_t *)_zuo_car(left))->str), -+ ZUO_STRING_PTR(((zuo_symbol_t *)_zuo_car(right))->str)) -+ < 1) { -+ p = zuo_cons(_zuo_car(left), z.o_null); -+ left = _zuo_cdr(left); -+ } else { -+ p = zuo_cons(_zuo_car(right), z.o_null); -+ right = _zuo_cdr(right); -+ } -+ -+ if (first == z.o_null) -+ first = p; -+ else -+ ((zuo_pair_t *)last)->cdr = p; -+ last = p; -+ } -+ -+ ((zuo_pair_t *)last)->cdr = ((left != z.o_null) ? left : right); -+ -+ return first; -+} -+ -+static zuo_t *zuo_trie_sorted_keys(zuo_t *trie_in, zuo_t *accum) { -+ return zuo_symbol_list_sort(zuo_trie_keys(trie_in, accum)); -+} -+ - /*======================================================================*/ - /* terminal support */ - /*======================================================================*/ -@@ -1571,7 +1624,7 @@ static void zuo_out(zuo_out_t *out, zuo_t *obj, zuo_print_mode_t mode) { - out_string(out, "opaque"); - out_string(out, ">"); - } else if (obj->tag == zuo_trie_node_tag) { -- zuo_t *keys = zuo_trie_keys(obj, z.o_null); -+ zuo_t *keys = zuo_trie_sorted_keys(obj, z.o_null); - if (mode == zuo_print_mode) { - out_string(out, "(hash"); - if (keys != z.o_null) -@@ -2587,7 +2640,7 @@ static zuo_t *zuo_hash_remove(zuo_t *ht, zuo_t *sym) { - - static zuo_t *zuo_hash_keys(zuo_t *ht) { - check_hash("hash-keys", ht); -- return zuo_trie_keys(ht, z.o_null); -+ return zuo_trie_sorted_keys(ht, z.o_null); - } - - static zuo_t *zuo_hash_keys_subset_p(zuo_t *ht, zuo_t *ht2) { --- -2.32.0 - - -From f2eecaa1dd875479d2cf51566223b3d0d7b9f738 Mon Sep 17 00:00:00 2001 -From: Matthew Flatt -Date: Sat, 23 Jul 2022 18:06:41 -0600 -Subject: [PATCH 3/4] Zuo: check for nul characters in `string->symbol` - -(cherry picked from commit e20022ccfad40d0ba2e77aa75bc4f775018c781f) ---- - racket/src/zuo/tests/symbol.zuo | 3 +++ - racket/src/zuo/zuo-doc/lang-zuo.scrbl | 4 ++- - racket/src/zuo/zuo.c | 37 +++++++++++++++++---------- - 3 files changed, 29 insertions(+), 15 deletions(-) - -diff --git a/racket/src/zuo/tests/symbol.zuo b/racket/src/zuo/tests/symbol.zuo -index 7775aeeb04..5600a89755 100644 ---- a/racket/src/zuo/tests/symbol.zuo -+++ b/racket/src/zuo/tests/symbol.zuo -@@ -19,3 +19,6 @@ - (check (not (equal? 'apple (string->uninterned-symbol "apple")))) - (check-arg-fail (string->symbol 'apple) not-string) - (check-arg-fail (string->uninterned-symbol 'apple) not-string) -+ -+(check-arg-fail (string->symbol "apple\0spice") "without a nul character") -+(check (symbol? (string->uninterned-symbol "apple\0spice"))) -diff --git a/racket/src/zuo/zuo-doc/lang-zuo.scrbl b/racket/src/zuo/zuo-doc/lang-zuo.scrbl -index 4605e47471..07dd5815b0 100644 ---- a/racket/src/zuo/zuo-doc/lang-zuo.scrbl -+++ b/racket/src/zuo/zuo-doc/lang-zuo.scrbl -@@ -500,7 +500,9 @@ back into Zuo. - )]{ - - Analogous to @realracket*[symbol? symbol->string string->symbol --string->uninterned-symbol] from @racketmodname[racket].} -+string->uninterned-symbol] from @racketmodname[racket], but -+@racket[string->symbol] accepts only strings that do not contain the -+null character.} - - - @section{Hash Tables (Persistent Maps)} -diff --git a/racket/src/zuo/zuo.c b/racket/src/zuo/zuo.c -index 88d5747326..17f161826d 100644 ---- a/racket/src/zuo/zuo.c -+++ b/racket/src/zuo/zuo.c -@@ -1323,7 +1323,7 @@ static zuo_t *zuo_symbol_list_sort(zuo_t *l_in) { - - first = last = z.o_null; - while ((left != z.o_null) && (right != z.o_null)) { -- zuo_t *p; -+ zuo_t *p, *s_left, *s_right; - - if (strcmp(ZUO_STRING_PTR(((zuo_symbol_t *)_zuo_car(left))->str), - ZUO_STRING_PTR(((zuo_symbol_t *)_zuo_car(right))->str)) -@@ -2573,8 +2573,28 @@ static zuo_t *zuo_substring(zuo_t *obj, zuo_t *start_i, zuo_t *end_i) { - return zuo_sized_string((const char *)&((zuo_string_t *)obj)->s[s_idx], e_idx - s_idx); - } - -+static int zuo_is_string_without_nul(zuo_t *obj) { -+ zuo_int_t i; -+ -+ if ((obj->tag != zuo_string_tag) -+ || ZUO_STRING_LEN(obj) == 0) -+ return 0; -+ -+ for (i = ZUO_STRING_LEN(obj); i--; ) { -+ if (((zuo_string_t *)obj)->s[i] == 0) -+ return 0; -+ } -+ -+ return 1; -+} -+ - static zuo_t *zuo_string_to_symbol(zuo_t *obj) { -- check_string("string->symbol", obj); -+ if (!zuo_is_string_without_nul(obj)) { -+ const char *who = "string->symbol"; -+ check_string(who, obj); -+ zuo_fail_arg(who, "string without a nul character", obj); -+ } -+ - return zuo_symbol_from_string(ZUO_STRING_PTR(obj), obj); - } - -@@ -3577,18 +3597,7 @@ static void *zuo_envvars_block(const char *who, zuo_t *envvars) - #endif - - static int zuo_is_path_string(zuo_t *obj) { -- zuo_int_t i; -- -- if ((obj->tag != zuo_string_tag) -- || ZUO_STRING_LEN(obj) == 0) -- return 0; -- -- for (i = ZUO_STRING_LEN(obj); i--; ) { -- if (((zuo_string_t *)obj)->s[i] == 0) -- return 0; -- } -- -- return 1; -+ return zuo_is_string_without_nul(obj); - } - - static zuo_t *zuo_path_string_p(zuo_t *obj) { --- -2.32.0 - - -From de6618cb3819d25580e3cd400ea09c8cf4f673a9 Mon Sep 17 00:00:00 2001 -From: Matthew Flatt -Date: Sat, 23 Jul 2022 19:50:46 -0600 -Subject: [PATCH 4/4] Zuo: CPPFLAGS_FOR_BUILD, too - -(cherry picked from commit cf82706c4b298f654a04c4bc8d98dff39b62a2ac) ---- - racket/src/zuo/Makefile.in | 3 ++- - racket/src/zuo/configure | 5 ++++- - racket/src/zuo/configure.ac | 4 +++- - 3 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/racket/src/zuo/Makefile.in b/racket/src/zuo/Makefile.in -index 747b584c5c..0376c038a8 100644 ---- a/racket/src/zuo/Makefile.in -+++ b/racket/src/zuo/Makefile.in -@@ -19,6 +19,7 @@ LIBS = @LIBS@ - - CC_FOR_BUILD = @CC_FOR_BUILD@ - CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ -+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ - LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ - LIBS_FOR_BUILD = @LIBS_FOR_BUILD@ - -@@ -29,7 +30,7 @@ zuos-to-run-and-install: zuo - ./zuo . zuos-to-run-and-install - - zuo: $(srcdir)/zuo.c -- $(CC_FOR_BUILD) $(FLAGS_FOR_BUILD) -DZUO_LIB_PATH='"'"$(srcdir)/lib"'"' -o zuo $(srcdir)/zuo.c $(LDFLAGS_FOR_BUILD) $(LIBS_FOR_BUILD) -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) -DZUO_LIB_PATH='"'"$(srcdir)/lib"'"' -o zuo $(srcdir)/zuo.c $(LDFLAGS_FOR_BUILD) $(LIBS_FOR_BUILD) - - .PHONY: check - check: zuo -diff --git a/racket/src/zuo/configure b/racket/src/zuo/configure -index 575ce07d96..7ac453e3bc 100755 ---- a/racket/src/zuo/configure -+++ b/racket/src/zuo/configure -@@ -591,6 +591,7 @@ LIBOBJS - EMBED_LIBS - LIBS_FOR_BUILD - LDFLAGS_FOR_BUILD -+CPPFLAGS_FOR_BUILD - CFLAGS_FOR_BUILD - CC_FOR_BUILD - OBJEXT -@@ -2590,7 +2591,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - if test "${CC_FOR_BUILD}" = ""; then - CC_FOR_BUILD='$(CC) -O2' -- CFLAGS_FOR_BUILD='$(CPPFLAGS) $(CFLAGS)' -+ CPPFLAGS_FOR_BUILD='$(CPPFLAGS)' -+ CFLAGS_FOR_BUILD='$(CFLAGS)' - LDFLAGS_FOR_BUILD='$(LDFLAGS)' - LIBS_FOR_BUILD='$(LIBS)' - fi -@@ -2600,6 +2602,7 @@ fi - - - -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: zuo libraries to embed: \"${EMBED_LIBS}\"" >&5 - $as_echo "$as_me: zuo libraries to embed: \"${EMBED_LIBS}\"" >&6;} - -diff --git a/racket/src/zuo/configure.ac b/racket/src/zuo/configure.ac -index 598ff79629..051ea0beb5 100644 ---- a/racket/src/zuo/configure.ac -+++ b/racket/src/zuo/configure.ac -@@ -27,12 +27,14 @@ AC_PROG_CC - - if test "${CC_FOR_BUILD}" = ""; then - CC_FOR_BUILD='$(CC) -O2' -- CFLAGS_FOR_BUILD='$(CPPFLAGS) $(CFLAGS)' -+ CPPFLAGS_FOR_BUILD='$(CPPFLAGS)' -+ CFLAGS_FOR_BUILD='$(CFLAGS)' - LDFLAGS_FOR_BUILD='$(LDFLAGS)' - LIBS_FOR_BUILD='$(LIBS)' - fi - AC_SUBST(CC_FOR_BUILD) - AC_SUBST(CFLAGS_FOR_BUILD) -+AC_SUBST(CPPFLAGS_FOR_BUILD) - AC_SUBST(LDFLAGS_FOR_BUILD) - AC_SUBST(LIBS_FOR_BUILD) - --- -2.32.0 - diff --git a/gnu/packages/patches/racket-backport-8.7-pkg-strip.patch b/gnu/packages/patches/racket-backport-8.7-pkg-strip.patch new file mode 100644 index 0000000000..703b6e8e82 --- /dev/null +++ b/gnu/packages/patches/racket-backport-8.7-pkg-strip.patch @@ -0,0 +1,90 @@ +From 1b7e15c23baf1fda44b1d0752902ddea11419fc5 Mon Sep 17 00:00:00 2001 +From: Philip McGrath +Date: Fri, 7 Oct 2022 02:15:13 -0400 +Subject: [PATCH] pkg/strip: handle read-only input + +A package directory supplied to the functions from `pkg/strip` might +have had all of its write permission bits unset. Since `copy-file` +preserves the permissions of the source file, we may end up with a +read-only file that we want to overwrite (e.g. an `info.rkt` file). +Explicitly setting `user-write-bit` before writing avoids this problem. +Conservatively, we only set the permissions when actually needed, +and we restore the original permissions when we are done. + +(cherry picked from commit 8c647c8cc9b66112198fcf9bea27fc0e3737162f) +--- + racket/collects/pkg/strip.rkt | 35 +++++++++++++++++++++++++++++------ + 1 file changed, 29 insertions(+), 6 deletions(-) + +diff --git a/racket/collects/pkg/strip.rkt b/racket/collects/pkg/strip.rkt +index 0ff58cea02..5899dbc6e6 100644 +--- a/racket/collects/pkg/strip.rkt ++++ b/racket/collects/pkg/strip.rkt +@@ -306,9 +306,8 @@ + #t + new-mod*-subs)))) + (unless (eq? mod new-mod) +- (call-with-output-file* ++ (call-with-output-file/writable + new-p +- #:exists 'truncate/replace + (lambda (out) (write new-mod out))))) + + (define (fixup-local-redirect-reference p js-path #:user [user-js-path js-path]) +@@ -340,9 +339,8 @@ + (string->bytes/utf-8 user-js-path) + (subbytes s (+ delta end2)))] + [else s])))) +- (call-with-output-file* ++ (call-with-output-file/writable + p +- #:exists 'truncate/replace + (lambda (out) (write-bytes new-bstr out))))) + + ;; Used in binary[-lib] mode: +@@ -383,9 +381,8 @@ + (convert-mod info-lib defns)])) + (unless (equal? new-content content) + ;; write updated: +- (call-with-output-file* ++ (call-with-output-file/writable + new-p +- #:exists 'truncate + (lambda (out) + (write new-content out) + (newline out))) +@@ -503,3 +500,29 @@ + which + dir) + (current-continuation-marks))))) ++ ++(define (call-with-output-file/writable pth proc) ++ ;; In case `pth` was copied from a file without the user-write-bit set, ++ ;; explicitly make it writable while we overwrite it. ++ (define (run) ++ (call-with-output-file* pth ++ #:exists 'truncate/replace ++ proc)) ++ (cond ++ [(file-exists? pth) ++ (define old-mode ++ (file-or-directory-permissions pth 'bits)) ++ (define new-mode ++ (if (eq? (system-type) 'windows) ++ (bitwise-ior old-mode user-write-bit group-write-bit other-write-bit) ++ (bitwise-ior old-mode user-write-bit))) ++ (if (= old-mode new-mode) ++ (run) ++ (dynamic-wind ++ (λ () ++ (file-or-directory-permissions pth new-mode)) ++ run ++ (λ () ++ (file-or-directory-permissions pth old-mode))))] ++ [else ++ (run)])) + +base-commit: 7e4f6e2362d4a08affbbae3c7ee4b98e325274c6 +-- +2.38.0 + diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 10f93a1362..20d293e998 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -191,7 +191,7 @@ (define-module (gnu packages racket) ;; ;; CODE: -(define %racket-version "8.6") ; Remember to update chez-scheme-for-racket! +(define %racket-version "8.7") ; Remember to update chez-scheme-for-racket! (define %zuo-version "1.0") ; defined in racket/src/zuo/zuo.c (define %racket-commit (string-append "v" %racket-version)) @@ -202,12 +202,9 @@ (define %racket-origin (url "https://github.com/racket/racket") (commit %racket-commit))) (sha256 - (base32 "1lw6h70dk8zqpl96zz0hmhn8vjcc0c7gw4prkfz2wid5bkq4mhg4")) + (base32 "0agwa1nrv8mizkqg9nffjli00djyx1r9n6y6b6ry7k13pb6i7xnj")) (file-name (git-file-name "racket" %racket-version)) - (patches (search-patches "racket-backport-8.6-cross-install.patch" - "racket-backport-8.6-docindex-write.patch" - "racket-backport-8.6-hurd.patch" - "racket-backport-8.6-zuo.patch" + (patches (search-patches "racket-backport-8.7-pkg-strip.patch" "racket-chez-scheme-bin-sh.patch" "racket-rktio-bin-sh.patch" "racket-zuo-bin-sh.patch")) @@ -689,6 +686,7 @@ (define-public racket ("net-lib" "pkgs/net-lib") ("racket-doc" "pkgs/racket-doc") ("racket-index" "pkgs/racket-index") + ("scheme-doc" "pkgs/scheme-doc") ("sandbox-lib" "pkgs/sandbox-lib") ("zo-lib" "pkgs/zo-lib"))) (simple-racket-origin @@ -698,7 +696,7 @@ (define-public racket "class-iop" (base32 "08z57q83cr7wnh6g8ah3hdhmsmf9zp1jfs7yvxv188l3hzvygy5l") '("class-iop-lib")) (simple-racket-origin - "compatibility" (base32 "0bfqwscjpyi325br5pa6g62g9c8lq18a80zp5g3d2qzn3n3mi6x0") + "compatibility" (base32 "0ydx9alrpqg03xcl7zm5qcpx017i554q9ramz69vpwlfy3zdqmdm") '("compatibility" "compatibility-doc" "compatibility-lib")) (simple-racket-origin "contract-profile" (base32 "1xm2z8g0dpv5d9h2sg680vx1a8ix9gbsdpxxb8qv1w7akp73paj3") @@ -710,19 +708,19 @@ (define-public racket "datalog" (base32 "0nf6cy4djpyhfvgpa6yn72apbz9s83gp0qg95pzjd0az4v6qwq1s") '(("datalog" "."))) (simple-racket-origin - "db" (base32 "0jzsbfcdm3xj0g8xxw3ky2swrhiqqsq2aqa3r08m641dc981dmjq") + "db" (base32 "0xx0k8yw2vb9b4vk2dwjfbpixnmriqsv7kpv3fvfxbwyg42y0db5") '("db" "db-doc" "db-lib")) (simple-racket-origin - "deinprogramm" (base32 "16ncs3ms3mmdavbk0mkhm2qi62vyyif9cch3sn1y64pij489x34v") + "deinprogramm" (base32 "1ngdjky4n1vy2b9jz1z4pnzl0vgvaqr3p0ff5sx82hs38qvvi5di") '("deinprogramm" "deinprogramm-signature")) (simple-racket-origin "distributed-places" (base32 "1dajpkj9balqcpv6cdk9hwjz592h1vq8rrx5vncariiac4vbdpa0") '("distributed-places" "distributed-places-doc" "distributed-places-lib")) (simple-racket-origin - "draw" (base32 "00rq5y4ba6z1d6jh76kl8rwpxrlqqp81a875zyhk3k81i42635sm") + "draw" (base32 "0pxpay04rylq3hqfpdrha2pw78hhwsjzq8w4f156gipin74lb7a2") '("draw" "draw-doc" "draw-lib")) (simple-racket-origin - "drracket" (base32 "05d7wssi0ry13alb5hl3llpsg30dd0jhyfv5nb1nmg189fn42q62") + "drracket" (base32 "12khv954v7xpi3wv50pp5l28ww1382apbvzvs67d6ik10nn3d0y4") '("drracket" "drracket-plugin-lib" "drracket-tool" @@ -736,10 +734,10 @@ (define-public racket "eli-tester" (base32 "0icx6wn14gjm8kdmq1jppqgq87sxkras4qb5xmdr6wigxafhjqyk") '(("eli-tester" "."))) (simple-racket-origin - "eopl" (base32 "1fmiixj6rxsgzwvgva8lvrvv0gl49v2405mp3s0i7ipis5c4n27s") + "eopl" (base32 "1n8lzvhggp6bp2hg4n51zg8f4ya10isb92pfzngss2ch7299zfj2") '(("eopl" "."))) (simple-racket-origin - "errortrace" (base32 "0r5630bb2d6hk0fbi95fmyfja54nnwdfcj2zjba124pp6xkjyavx") + "errortrace" (base32 "0l9k2rx6z4jkid7kxhbs763s66pxbzvfrgxajykbrmqkv77lhb3w") '("errortrace" "errortrace-doc" "errortrace-lib")) (simple-racket-origin "expeditor" (base32 "0mjfwb4wzwsg5xj3k6cmik0va432n56rp5h7rxx1c2yy3prh1j7q") @@ -756,13 +754,13 @@ (define-public racket "games" (base32 "0kpn3izlx1ccd0pj0dnvmnrhny51b85xy418a7psj70lz8j8415d") '(("games" "."))) (simple-racket-origin - "gui" (base32 "18pcnx3wi8f32i2frm8bn9pi08n4y3c5jgqs4gy21w6f84dv401w") + "gui" (base32 "027imnxwm0663yn9mbkq8sjm1qr1pw7zf4ra168k746hp446ah58") '("gui" "gui-doc" "gui-lib" "tex-table")) (simple-racket-origin "gui-pkg-manager" (base32 "1ji9448d723nklqvycwdswj0ni28sabrncag14f9mx47did5myb5") '("gui-pkg-manager-lib")) (simple-racket-origin - "htdp" (base32 "173xy6ks55npvwn6cykjs41s9qfb70hc2gfjiqvw91hdsbjykwir") + "htdp" (base32 "0pf2kf63xj9s0n44vaxlmnd1bdb1a44gcp807a3b3cmlc1lkb36z") '("htdp" "htdp-doc" "htdp-lib")) (simple-racket-origin "html" (base32 "18n1jnjgzfknc8nv8dppi85nb8q08gqdwkg6hfjk08x0p00anx2x") @@ -795,7 +793,7 @@ (define-public racket "mzcom" (base32 "0rc9pfj7gwm5azghqvcibz6si1x5s2v8mr2yngk7ssq9gzfbi6a4") '(("mzcom" "."))) (simple-racket-origin - "mzscheme" (base32 "192c52zi726h5wjamxrhivjw2waq1im0zpyxhbrkrxknm8x84bs9") + "mzscheme" (base32 "04kyrhznq46mklacf7pms4fv47zsimqqk3948r3w2ym9n04fhjsx") '("mzscheme" "mzscheme-doc" "mzscheme-lib")) (racket-packages-origin "net-cookies" (origin @@ -824,13 +822,13 @@ (define-public racket "option-contract" (base32 "07cncg9pi15cm19k7rzv54vx83wq7y42i2m6bgzaqja1h8vnj2ww") '("option-contract" "option-contract-doc" "option-contract-lib")) (simple-racket-origin - "parser-tools" (base32 "04ycihliikh0c47ivp09gayxiql9d9wpl216czic19cj6f7rmcnj") + "parser-tools" (base32 "11m1x8q0cqb4b082423iv19s86xgkshv29cb4hp8yx84lb0vpwx3") '("parser-tools" "parser-tools-doc" "parser-tools-lib")) (simple-racket-origin "pconvert" (base32 "00czi0p399mmyrvxyrs5kniizpkqfxyz2ncxqi2jy79a7wk79pb1") '("pconvert-lib")) (simple-racket-origin - "pict" (base32 "1n0v7kynkiin1v8igs9m8k8vfwjn5cswanhq2imp1pxzjvdyq6sx") + "pict" (base32 "063a1lc6v1i8ywxcskkvvfxdvlx0qhr0l4l3dkibmnli47mdhv7g") '("pict" "pict-doc" "pict-lib")) (simple-racket-origin "pict-snip" (base32 "081nwiy4a0n4f7xws16hqbhf0j3kz5alizndi3nnyr3chm4kng6x") @@ -839,13 +837,13 @@ (define-public racket "picturing-programs" (base32 "1g6xr39hx1j03gb3d4dljm3v91xcj2gfpq3dgy5xvplzr6cmmxgr") '(("picturing-programs" "."))) (simple-racket-origin - "plai" (base32 "0i983sh0r0zm2ng4j44m5aw9669kh5fhp91bzpc9jm280rfcqvyl") + "plai" (base32 "18kz31pj4lanlf9mn2yc0q9sxis264wb4f9v85ga23wd7g1hrzbq") '("plai" "plai-doc" "plai-lib")) (simple-racket-origin "planet" (base32 "0r2yqrzrmdjjyr14k6hhlzc5kzrcx3583m1s02mhrcmpfw0s85w9") '("planet" "planet-doc" "planet-lib")) (simple-racket-origin - "plot" (base32 "04871pspbm0q3bz5896sa3jw2rp9i6jf0b5aivrxfp56vxxd2ybb") + "plot" (base32 "1129k78vyqg2cbc87r9ak95zpa1ghh26fmz3wr8gm556j5j0k6y5") '("plot" "plot-compat" "plot-doc" "plot-gui-lib" "plot-lib")) (simple-racket-origin "preprocessor" (base32 "1p5aid58ifnjy4xl0ysh85cq39k25661v975jrpk182z3k5621mg") @@ -867,7 +865,7 @@ (define-public racket "r5rs" (base32 "1g3cysj7z88r38vkzvi8g2fb2hn4yg1fdhy5smxw303jxgl3inp6") '("r5rs" "r5rs-doc" "r5rs-lib")) (simple-racket-origin - "r6rs" (base32 "0b1ymzdp10r0flw2acbidjsh5ma1pm5hy54jss37sxf89z3xbvm4") + "r6rs" (base32 "1mgcxd88s67w47a2z1i6snz8qhbngjbmr6rs4pchpnrfap96ssgl") '("r6rs" "r6rs-doc" "r6rs-lib")) (racket-packages-origin "racket-cheat" (origin @@ -900,7 +898,7 @@ (define-public racket "realm" (base32 "0rlvwyd6rpyl0zda4a5p8dp346fvqzc8555dgfnrhliymkxb6x4g") '(("realm" "."))) (simple-racket-origin - "redex" (base32 "06dhyqmin0qdm6b6sdvgzpy3pa4svlw42ld9k2h1dxcr852czil7") + "redex" (base32 "1v5p65y3hnp1mfvy0jl4lhmaw9s3qzzfcfh3fhihhqxsybbqp3q3") '("redex" "redex-benchmark" "redex-doc" @@ -915,7 +913,7 @@ (define-public racket "scheme-lib" (base32 "0pcf0y8rp4qyjhaz5ww5sr5diq0wpcdfrrnask7zapyklzx1jx8x") '(("scheme-lib" "."))) (simple-racket-origin - "scribble" (base32 "0a11kvcnzp04mp4xxq68rkl09jv00hv81k2nmwkmwpfx9b2acvd3") + "scribble" (base32 "1n0ywdham53h2ibkhc0cnrhhaxfkl7ax0bx5sdfpnyh2yrabxwqf") '("scribble" "scribble-doc" "scribble-html-lib" @@ -941,13 +939,13 @@ (define-public racket "slatex" (base32 "0pkm2isbbdk63slrbsxcql7rr0wdrw5kapw1xq4ps5k8dhlzv8x0") '(("slatex" "."))) (simple-racket-origin - "slideshow" (base32 "1znv1i2d0610hhy71q932xy7wka00q3q50in1xfnk8ibg7nzkagm") + "slideshow" (base32 "0s6w4iq7m263jwx01c5czkk1a2950hdpxn5yirxvnr26qpjpfyzr") '("slideshow" "slideshow-doc" "slideshow-exe" "slideshow-lib" "slideshow-plugin")) (simple-racket-origin - "snip" (base32 "01r9wc5xr3q3n4yyif6j0a37rgdzmpslxn05k13ksik73b3wj6hj") + "snip" (base32 "19n2i1m2nysrbv38jxk32abymdbhcxdcrrjsg4ppfbng8niygc8x") '("snip" "snip-lib")) (simple-racket-origin - "typed-racket" (base32 "03wsz647fi58brbg33fw1xavp100gzfvngdy8bk7bdc0jfg8a18l") + "typed-racket" (base32 "0yh9vcg1bjamf6nq3hqxwjg07kjkxyqhvymv3r64j1n4hiiwz6iv") '("source-syntax" "typed-racket" "typed-racket-compatibility" @@ -955,10 +953,10 @@ (define-public racket "typed-racket-lib" "typed-racket-more")) (simple-racket-origin - "srfi" (base32 "0aqbcdv2dfc2xnk0h6zfi56p7bpwqji8s88qds3d03hhh9k28gvn") + "srfi" (base32 "13xvfzr5546m3a4kksyawzcl93nrklasr1slfa5ar3p77h962la4") '("srfi" "srfi-doc" "srfi-lib" "srfi-lite-lib")) (simple-racket-origin - "string-constants" (base32 "1kg3vxq2hcd0vl76brgpzdwbrb65a4nrrkc6hj4az5lfbbdvqz47") + "string-constants" (base32 "174q3ihcp8s52mmlk7z0sipjksiac432pfkm0inlwi92s6p7dlb3") '("string-constants" "string-constants-doc" "string-constants-lib")) (simple-racket-origin "swindle" (base32 "03n9ymjhrw45h7hxkw4nq8nidnvs9mfzb4228s2cjfaqbgqxvsyb") -- 2.38.0