From patchwork Wed Dec 14 20:12:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45265 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 40C9C27BBED; Wed, 14 Dec 2022 20:14:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 B692E27BBE9 for ; Wed, 14 Dec 2022 20:14:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Y8o-0001Zf-CL; Wed, 14 Dec 2022 15:14:10 -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 1p5Y8h-0001ZF-QJ for guix-patches@gnu.org; Wed, 14 Dec 2022 15:14:03 -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 1p5Y8h-0007SR-IT for guix-patches@gnu.org; Wed, 14 Dec 2022 15:14:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p5Y8h-0001El-Bf for guix-patches@gnu.org; Wed, 14 Dec 2022 15:14:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60072] [PATCH 2/2] gnu: %guile-static-3.0: New variable. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Dec 2022 20:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60072 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60072@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16710487924718 (code B ref -1); Wed, 14 Dec 2022 20:14:03 +0000 Received: (at submit) by debbugs.gnu.org; 14 Dec 2022 20:13:12 +0000 Received: from localhost ([127.0.0.1]:41333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5Y7s-0001E2-Dr for submit@debbugs.gnu.org; Wed, 14 Dec 2022 15:13:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:59852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p5Y7q-0001Dw-E4 for submit@debbugs.gnu.org; Wed, 14 Dec 2022 15:13:10 -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 1p5Y7q-0001VF-9o for guix-patches@gnu.org; Wed, 14 Dec 2022 15:13:10 -0500 Received: from mail-qv1-xf2e.google.com ([2607:f8b0:4864:20::f2e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p5Y7o-0007LT-UG for guix-patches@gnu.org; Wed, 14 Dec 2022 15:13:10 -0500 Received: by mail-qv1-xf2e.google.com with SMTP id i12so526480qvs.2 for ; Wed, 14 Dec 2022 12:13:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/0KFjdA3nIbe3SnnzipIkZEZ7XDG/48MIkjhAT1my+A=; b=UxUobwUPXb8KK4nwJbb3xHAi5EHWv2Qqp0KyGC53UP/zTaT0vqrf8W9sUUHYeeylhD Xvd+EIk740lOWUmnDWYa17qPo046kBeJOVA+lbwNmOH89pbjU4TXDtsBTZwC0anDVb/n AMDjUJhvzAlHydHUKwSNppoga1C182885UfBTMli46dwesh9F2apqeD3gvQ5yIKiSQbx 5rZi3eXfFTh5H7JTLxo+SIXvdiUB5KrJQOEiLiddrjsm983m14uVQnozKOU7YVQOaj3d WWSaHYrloGLAr29Ew20GeFETK4NmkeXiC0V3NVVW6ZRC7yFdowWLsO+TyClaGrVUn+Cq Jxbg== 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 :subject:date:message-id:reply-to; bh=/0KFjdA3nIbe3SnnzipIkZEZ7XDG/48MIkjhAT1my+A=; b=FDA6PdirZUR3zy3t1TrckIVZ1+EVygX3Tsq4FnLRkIv+5Qj1Dd/RLOX2WFMIofViga n/QkBY/Dw+35+YAwep87rU0OfnCI4MHTCi32Szev4mZuKseXDiO0pzQiwTyhq+R1BVea XJxypEdLvqv/GyH5rIgqWUpssl4OVHTAsP10HBMxObPCRx1BnLMMUbfb4j1KUbwHJm6i rjsjuhYZCP01MLOMy4Cqc/4z7mk3kTmQUAzJAyfRdDKKO6bRG/TFBH3iyMuJFn4qPEoG kr2ggMCgyowR6Phe++kHWUq2Z19M9CntGqBulvJda/IhEYE0NVpHRR7sx5b04zQmPAUU E3Ug== X-Gm-Message-State: ANoB5pmCjDbT83dTj6IdecDAdqw3H39iFycdwqbRxSZIPdopqWTrEC3F 2guQyZws3WaJn5LfYvgxVihProPZRfqskQ== X-Google-Smtp-Source: AA0mqf7w+0KvgAH8RSOpc9mY5Yp4gdimi8T2T/3pi+L2HkgrX5TSWrYFI0Fyxb2K07dt8Jvllg6XPA== X-Received: by 2002:a0c:e34f:0:b0:4c7:1a90:2297 with SMTP id a15-20020a0ce34f000000b004c71a902297mr37641303qvm.41.1671048787595; Wed, 14 Dec 2022 12:13:07 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1006]) by smtp.gmail.com with ESMTPSA id bl14-20020a05620a1a8e00b006faa2c0100bsm10581658qkb.110.2022.12.14.12.13.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 12:13:07 -0800 (PST) From: Maxim Cournoyer Date: Wed, 14 Dec 2022 15:12:56 -0500 Message-Id: <20221214201256.13459-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221214201256.13459-1-maxim.cournoyer@gmail.com> References: <20221214201256.13459-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f2e; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf2e.google.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 * gnu/packages/make-bootstrap.scm (%guile-static-3.0): New variable. (%guile-static-stripped): Use it. --- gnu/packages/make-bootstrap.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 24855f6b28..a0999cb477 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -748,6 +748,12 @@ (define %guile-static "guile-default-utf8.patch" "guile-linux-syscalls.patch"))) +(define %guile-static-3.0 + (make-guile-static guile-3.0-latest + '("guile-2.2-default-utf8.patch" + "guile-3.0-linux-syscalls.patch" + "guile-3.0-relocatable.patch"))) + (define* (make-guile-static-stripped static-guile) (package (inherit static-guile) @@ -796,11 +802,7 @@ (define* (make-guile-static-stripped static-guile) (define %guile-static-stripped ;; A stripped static Guile 3.0 binary, for use in initrds ;; and during bootstrap. - (make-guile-static-stripped - (make-guile-static guile-3.0-latest - '("guile-2.2-default-utf8.patch" - "guile-3.0-linux-syscalls.patch" - "guile-3.0-relocatable.patch")))) + (make-guile-static-stripped %guile-static-3.0)) (define (tarball-package pkg) "Return a package containing a tarball of PKG."