From patchwork Thu Aug 11 11:08:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 41554 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BCD3527BBED; Thu, 11 Aug 2022 12:10:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E8BD527BBEA for ; Thu, 11 Aug 2022 12:10:20 +0100 (BST) Received: from localhost ([::1]:56772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oM64y-0000kR-2E for patchwork@mira.cbaines.net; Thu, 11 Aug 2022 07:10:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oM64k-0000iK-4Z for guix-patches@gnu.org; Thu, 11 Aug 2022 07:10:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33880) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oM64j-0005Z9-QA for guix-patches@gnu.org; Thu, 11 Aug 2022 07:10:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oM64j-0006ZG-M3 for guix-patches@gnu.org; Thu, 11 Aug 2022 07:10:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57050] [PATCH v2 11/13] gnu: racket: Use Racket CS on all systems. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Aug 2022 11:10:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57050@debbugs.gnu.org Cc: Liliana Marie Prikler , Liliana Marie Prikler , Philip McGrath , Thiago Jung Bauermann Received: via spool by 57050-submit@debbugs.gnu.org id=B57050.166021617125117 (code B ref 57050); Thu, 11 Aug 2022 11:10:05 +0000 Received: (at 57050) by debbugs.gnu.org; 11 Aug 2022 11:09:31 +0000 Received: from localhost ([127.0.0.1]:51847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM64A-0006X1-CN for submit@debbugs.gnu.org; Thu, 11 Aug 2022 07:09:30 -0400 Received: from mail-qk1-f181.google.com ([209.85.222.181]:33409) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM646-0006V7-QR for 57050@debbugs.gnu.org; Thu, 11 Aug 2022 07:09:27 -0400 Received: by mail-qk1-f181.google.com with SMTP id f14so13213845qkm.0 for <57050@debbugs.gnu.org>; Thu, 11 Aug 2022 04:09:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=cAlwoSnviEUTVlhOjMlaO48NpqwtNpELKoMUv7d4ars=; b=hVXrNLC7JIOrZcmVt1ttFUhtgMEw3z3b3ssbz6W9SFhZmpCoKJKbVtWStD0fE2C+Jv pSDCxBxKbyT5AdtQRL2n1crn2HeeFcyEVZMjNuHQhAlI0+ga9J5bT17dmC8XjbruZx3m PcvrgtsaQyiMx+q9Q3kWwfcx8ksRaqv+XPTySnS7OyBW4U87/7AcSEYxiBoALxIiddzf NfE2aP3RWmpCayp1h3c0iRP5aOuBG7fdJ53DAZy29qCg2rzoJZhPKXHgrcV2UQTw3wPF g98aq5+tHb0Ptha8FRUoRULKFUYaoqndcWOPF45RD2ElLGbnjlCm0xCxTrfpB8x8ps2q sNkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=cAlwoSnviEUTVlhOjMlaO48NpqwtNpELKoMUv7d4ars=; b=L2bAb+4cUY9JYfORITutnem+qzgr2tLjyiYOu3/eRohg+gorEBYYFO5mG1LGTO2hzL pW+gXOqunbHWUcS0m7KawyX2/moRwTkSy2oylJJ+BcoLVLZFE1CHXyaxRa78w2QJ+etV N3ZM6HvZcniuDM95U7Rc9PxIMGNYEBJZPG7Ptm6Jgr03ducRag/N4wbrWYyEgSrLs54f Pn22M9Ql4V4HYY+hLPun9x1y4Adqtolj/LFleU7erSYZxXHHCNzO1oe8bOlHhxRCO6CI e4TUxT4DF+xWZP7A+sdkzAlx5ZPqJz6qZ4bOrGyw88oAkfcHwJ20oh7EIY4N3PsrAKIh t9nw== X-Gm-Message-State: ACgBeo3xXvZA1tHe20qjfZQlpAXHhv2LNbCjZWDI+LO4rdUx+keRxjKA xAyP17RDBqbzyv9aSxneIZmNVsMFfRfMPjXx X-Google-Smtp-Source: AA6agR6EGmB78/XUD/ujpGsAagNL4RcJLrwv7QzN47vtGm6YRcQvBmD34Yyk4jRMH2fkoW2BlRCyWw== X-Received: by 2002:a05:620a:601a:b0:6b9:3ffb:3dd2 with SMTP id dw26-20020a05620a601a00b006b93ffb3dd2mr15754411qkb.643.1660216166428; Thu, 11 Aug 2022 04:09:26 -0700 (PDT) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id z66-20020a379745000000b006b95b0a714esm1700043qkd.17.2022.08.11.04.09.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 11 Aug 2022 04:09:26 -0700 (PDT) From: Philip McGrath Date: Thu, 11 Aug 2022 07:08:21 -0400 Message-Id: <72d693448b5e07e8322eb3eeb302b16d20adfaf5.1660215295.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This patch uses the 'pbarch' support added to 'racket-vm-cs' to make it the default Racket VM implementation on all systems. * gnu/packages/racket.scm (racket-vm-for-system): Remove. (racket-minimal, racket)[inputs]: Replace '(racket-vm-for-system)' with 'racket-vm-cs'. --- gnu/packages/racket.scm | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 008adcc072..b1de6cf885 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -129,10 +129,9 @@ (define-module (gnu packages racket) ;; This file defines the packages 'racket-vm-cgc', 'racket-vm-bc', and ;; 'racket-vm-cs'. All three are in-place builds of 'racket/src/' and ;; 'racket/collects/' and are installed to 'opt/racket-vm/' in the store -;; output. The function 'racket-vm-for-system' returns the recomended Racket -;; VM package for a given system. +;; output. ;; -;; We then define the packages 'racket-minimal' and +;; Using 'racket-vm-cs', we then define the packages 'racket-minimal' and ;; 'racket'. These use Racket's support for ``layered installations'', which ;; allow an immutable base layer to be extended with additional packages. ;; They use the layer configuration directly provide ready-to-install FHS-like @@ -193,17 +192,6 @@ (define-module (gnu packages racket) ;; ;; CODE: -(define* (racket-vm-for-system #:optional - (system (or (%current-target-system) - (%current-system)))) - "Return 'racket-vm-cs' if we are able to build it for SYSTEM; 'racket-vm-bc' -otherwise." - ;; Once we figure out the issues in https://racket.discourse.group/t/950, - ;; we can use 'racket-vm-cs' everywhere. - (if (racket-cs-native-supported-system? system) - racket-vm-cs - racket-vm-bc)) - (define %racket-version "8.6") ; Remember to update chez-scheme-for-racket! (define %zuo-version "1.0") ; defined in racket/src/zuo/zuo.c (define %racket-commit @@ -586,7 +574,7 @@ (define-public racket-minimal (inputs (list openssl sqlite - (racket-vm-for-system) + racket-vm-cs (racket-packages-origin "base" %racket-origin '(("base" "pkgs/base") @@ -704,7 +692,7 @@ (define-public racket unixodbc libedit ;; TODO reconsider in light of expeditor and readline-gpl racket-minimal ;; <-- TODO non-tethered layer - (racket-vm-for-system) + racket-vm-cs (simple-racket-origin "2d" (base32 "0fb5v6058ls08xw3zbmqyr2ym0psm119gl9ffgmhm9w8rs9i4dq7") '("2d" "2d-doc" "2d-lib"))