From patchwork Tue Jul 6 08:14:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 31193 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 0C4FB27BC81; Tue, 6 Jul 2021 09:17:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BAE4C27BC78 for ; Tue, 6 Jul 2021 09:17:21 +0100 (BST) Received: from localhost ([::1]:53160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0gGe-0003Eu-Qr for patchwork@mira.cbaines.net; Tue, 06 Jul 2021 04:17:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0gGN-0003Cm-2f for guix-patches@gnu.org; Tue, 06 Jul 2021 04:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35685) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0gGM-0002Tm-B2 for guix-patches@gnu.org; Tue, 06 Jul 2021 04:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m0gGM-0006jK-7I for guix-patches@gnu.org; Tue, 06 Jul 2021 04:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49434] [PATCH 2/2] gnu: bootstrap-tarballs: Use guile-3.0 bootstrap tarball. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Jul 2021 08:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49434 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49434@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 49434-submit@debbugs.gnu.org id=B49434.162555936925797 (code B ref 49434); Tue, 06 Jul 2021 08:17:02 +0000 Received: (at 49434) by debbugs.gnu.org; 6 Jul 2021 08:16:09 +0000 Received: from localhost ([127.0.0.1]:47231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0gFV-0006i1-Fs for submit@debbugs.gnu.org; Tue, 06 Jul 2021 04:16:09 -0400 Received: from flashner.co.il ([178.62.234.194]:45346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0gFU-0006hc-2f for 49434@debbugs.gnu.org; Tue, 06 Jul 2021 04:16:08 -0400 Received: from localhost (unknown [31.210.177.125]) by flashner.co.il (Postfix) with ESMTPSA id 4F10D4000B; Tue, 6 Jul 2021 08:16:02 +0000 (UTC) From: Efraim Flashner Date: Tue, 6 Jul 2021 11:14:19 +0300 Message-Id: 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 * gnu/packages/make-bootstrap.scm (%guile-bootstrap-tarball): Use guile-3.0. (%guile-static-stripped): Remove variable. --- gnu/packages/make-bootstrap.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index ff9376e91f..d66acc2e70 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -55,7 +55,6 @@ %mes-bootstrap-tarball %bootstrap-tarballs - %guile-static-stripped %guile-3.0-static-stripped)) ;;; Commentary: @@ -799,12 +798,9 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (outputs '("out")) (synopsis "Minimal statically-linked and relocatable Guile"))) -(define %guile-static-stripped - ;; A stripped static Guile binary, for use during bootstrap. - (make-guile-static-stripped %guile-static)) - (define %guile-3.0-static-stripped - ;; A stripped static Guile 3.0 binary, for use in initrds. + ;; A stripped static Guile 3.0 binary, for use in initrds + ;; and during bootstrap. (make-guile-static-stripped (make-guile-static guile-3.0 '("guile-2.2-default-utf8.patch" @@ -867,7 +863,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define %guile-bootstrap-tarball ;; A tarball with the statically-linked, relocatable Guile. - (tarball-package %guile-static-stripped)) + (tarball-package %guile-3.0-static-stripped)) (define %mescc-tools-bootstrap-tarball ;; A tarball with statically-linked MesCC binary seed.