From patchwork Thu Aug 24 00:08:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 53168 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 55F0727BBEA; Thu, 24 Aug 2023 01:09:25 +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=ham 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 6542227BBE2 for ; Thu, 24 Aug 2023 01:09:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYxuI-0006Wf-BF; Wed, 23 Aug 2023 20:09:02 -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 1qYxuF-0006Vy-Vz for guix-patches@gnu.org; Wed, 23 Aug 2023 20:09:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qYxuF-0006yn-Nj for guix-patches@gnu.org; Wed, 23 Aug 2023 20:08:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYxuJ-0003fy-8u for guix-patches@gnu.org; Wed, 23 Aug 2023 20:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65482] [PATCH 3/3] gnu: chez-scheme-for-racket-bootstrap-bootfiles: Remove workaround. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Aug 2023 00:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65482 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65482@debbugs.gnu.org Cc: Tim Johann , Efraim Flashner , Philip McGrath Received: via spool by 65482-submit@debbugs.gnu.org id=B65482.169283573414099 (code B ref 65482); Thu, 24 Aug 2023 00:09:03 +0000 Received: (at 65482) by debbugs.gnu.org; 24 Aug 2023 00:08:54 +0000 Received: from localhost ([127.0.0.1]:35628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYxu9-0003fJ-LF for submit@debbugs.gnu.org; Wed, 23 Aug 2023 20:08:53 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:36985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYxu8-0003ev-9C for 65482@debbugs.gnu.org; Wed, 23 Aug 2023 20:08:52 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id B372D3200947; Wed, 23 Aug 2023 20:08:42 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Wed, 23 Aug 2023 20:08:43 -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:sender:subject :subject:to:to; s=fm1; t=1692835722; x=1692922122; bh=Y9QpNoz9Mo HvwLlybIQU7BcL0Wb1SPlchYLywNZ2FHY=; b=n6pzlUXAoz8Yr0eXzAQERHRlgV qLeEv5+xMoL/8LNjzEvm2EpL+cQdnuF7UyLbr5+5I+jZjTYPvuOzXdkPy/03debu pN4dobuUXcx6jBcuQS6m0xPsp82yEdCP2XJEloLUTFaQOT+oszIvurngX1OaeDbW H0u9pjT0klfERnkhM+zbHo7kmG5imAsYfDfDCLOyZpmOeeaPcuM7aI5wBYvq5kVG S7lVx8sm+TeLhArgAr51KSiR7QoGWhMlubsTuo3aRbz43ChTRCSKwRaTKP/kzHDu ywZtB02TdR0GjNiSsTev3yocSTA6YL7qV2eEOBmC/4B9iGNCciqSUzVdu3xg== 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=1692835722; x= 1692922122; bh=Y9QpNoz9MoHvwLlybIQU7BcL0Wb1SPlchYLywNZ2FHY=; b=B hEi8mBNZ6eu+JZMGwf141GIofUKIq+ePLO7ucjyly3E+luIvSmao1X2D9hkj+HkU c+EewnFgx8Uaa8ESDrxXa5oR2bGo6tH59xWZWQaO5AWX4+8wKRAey31pDdR0dWkE ub54VzZGH+vn6Ehnkq7OrdIV9ZyopGXe4q+Ro3oWc2V7Lz6yVbExZBQdabOEH8H6 T9y8TsqiK9UI/3dSagYNi1pSYjDK39xBxQ8npLkFFN3ursbgBnNsve1jGOSukBYY XsFAc4Nk1aBzadY9Kq5nL4IT8wfD0ubRxbOH4pMTG+JUcuAZx9usoP/r4hMTm1Kd 7AEvMdz4DPZAAKbd7qQbw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedruddvhedgfeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheprfhhihhl ihhpucfotgfirhgrthhhuceophhhihhlihhpsehphhhilhhiphhmtghgrhgrthhhrdgtoh hmqeenucggtffrrghtthgvrhhnpeduhedvfeejteffffefkedthedtteduhfdthfdutdeu ueekhfevhefhhedvhfehffenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpsehp hhhilhhiphhmtghgrhgrthhhrdgtohhm X-ME-Proxy: Feedback-ID: i2b1146f3:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 23 Aug 2023 20:08:41 -0400 (EDT) From: Philip McGrath Date: Wed, 23 Aug 2023 20:08:06 -0400 Message-ID: <510912032455b5c56984242cf06997c0eff688c7.1692834182.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.41.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Architecture autodetection in rktboot was fixed upstream, and the fix is included in racket-backport-8.10-rktboot.patch for Guix. This commit goes beyond reverting b4fbeae3d90a5d0f8146441772436df2eb471491: the upstream fix also supports 'pbarch' machine types, so we never need to supply a '--machine' argument to rktboot. * gnu/packages/chez.scm (chez-scheme-for-racket-bootstrap-bootfiles) [arguments]: Change 'build' phase to never use '--machine' for rktboot. --- gnu/packages/chez.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index e5694ec1cf..3f53beac1a 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -691,13 +691,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" - ;; Temporary handling of builds on non-x86 architectures, - ;; see https://github.com/racket/racket/issues/3948 - ;; Autodetect in rktboot only addresses x86 archs, so far. - #$@(let ((m (or (racket-cs-native-supported-system?) - (nix-system->pbarch-machine-type)))) - #~("--machine" #$m)))))))))))) + "../rktboot/main.rkt")))))))))) (supported-systems (package-supported-systems chez-scheme-for-racket)) (home-page "https://github.com/racket/ChezScheme")