From patchwork Fri Oct 28 12:29:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 44169 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 C4E1927BBEA; Fri, 28 Oct 2022 13:35:21 +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=-3.9 required=5.0 tests=BAYES_00,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 61F8227BBE9 for ; Fri, 28 Oct 2022 13:35:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ooOZl-0001UJ-Qc; Fri, 28 Oct 2022 08:35:05 -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 1ooOUt-0005ND-Ed for guix-patches@gnu.org; Fri, 28 Oct 2022 08:30:07 -0400 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 1ooOUs-0003kw-Vi for guix-patches@gnu.org; Fri, 28 Oct 2022 08:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ooOUr-0005z0-QU for guix-patches@gnu.org; Fri, 28 Oct 2022 08:30:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58834] [PATCH 1/3] gnu: gzip: Fix script interpreters when cross-compiling. References: <871qqs6sz7.fsf@cbaines.net> In-Reply-To: <871qqs6sz7.fsf@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Oct 2022 12:30:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58834@debbugs.gnu.org Received: via spool by 58834-submit@debbugs.gnu.org id=B58834.166696018022931 (code B ref 58834); Fri, 28 Oct 2022 12:30:01 +0000 Received: (at 58834) by debbugs.gnu.org; 28 Oct 2022 12:29:40 +0000 Received: from localhost ([127.0.0.1]:60571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooOUV-0005xl-SE for submit@debbugs.gnu.org; Fri, 28 Oct 2022 08:29:40 -0400 Received: from mira.cbaines.net ([212.71.252.8]:41642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooOUU-0005xX-Rr for 58834@debbugs.gnu.org; Fri, 28 Oct 2022 08:29:39 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id ECCD327BBE9 for <58834@debbugs.gnu.org>; Fri, 28 Oct 2022 13:29:36 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 99887388 for <58834@debbugs.gnu.org>; Fri, 28 Oct 2022 12:29:36 +0000 (UTC) From: Christopher Baines Date: Fri, 28 Oct 2022 13:29:34 +0100 Message-Id: <20221028122936.3717-1-mail@cbaines.net> X-Mailer: git-send-email 2.37.3 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Add bash-minimal as an input fixes the interpreters for various scripts (like zcat and zless) when cross-compiling. * gnu/packages/compression.scm (gzip)[inputs]: Add bash-minimal when cross compiling. --- gnu/packages/compression.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index f2bf5c443c..b3a678480d 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -70,6 +70,7 @@ (define-module (gnu packages compression) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages benchmark) #:use-module (gnu packages boost) #:use-module (gnu packages check) @@ -281,6 +282,10 @@ (define-public gzip (string-append "exec " (assoc-ref outputs "out") "/bin/gzip"))) #t))))) + (inputs + `(,@(if (%current-target-system) + `(("bash" ,bash-minimal)) + '()))) (description "GNU Gzip provides data compression and decompression utilities; the typical extension is \".gz\". Unlike the \"zip\" format, it compresses a single From patchwork Fri Oct 28 12:29:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 44171 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 513A927BBEA; Fri, 28 Oct 2022 13:35:53 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 CA52D27BBE9 for ; Fri, 28 Oct 2022 13:35:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ooOZu-0001pz-W3; Fri, 28 Oct 2022 08:35:15 -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 1ooOUs-0005N7-M2 for guix-patches@gnu.org; Fri, 28 Oct 2022 08:30:07 -0400 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 1ooOUs-0003kn-E7 for guix-patches@gnu.org; Fri, 28 Oct 2022 08:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ooOUs-0005zD-8j for guix-patches@gnu.org; Fri, 28 Oct 2022 08:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58834] [PATCH 2/3] gnu: xz: Fix script interpreters when cross-compiling. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Oct 2022 12:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58834@debbugs.gnu.org Received: via spool by 58834-submit@debbugs.gnu.org id=B58834.166696018022943 (code B ref 58834); Fri, 28 Oct 2022 12:30:02 +0000 Received: (at 58834) by debbugs.gnu.org; 28 Oct 2022 12:29:40 +0000 Received: from localhost ([127.0.0.1]:60574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooOUW-0005xo-4G for submit@debbugs.gnu.org; Fri, 28 Oct 2022 08:29:40 -0400 Received: from mira.cbaines.net ([212.71.252.8]:41644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooOUV-0005xY-2K for 58834@debbugs.gnu.org; Fri, 28 Oct 2022 08:29:39 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 02DBC27BBEA for <58834@debbugs.gnu.org>; Fri, 28 Oct 2022 13:29:37 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 12398902 for <58834@debbugs.gnu.org>; Fri, 28 Oct 2022 12:29:36 +0000 (UTC) From: Christopher Baines Date: Fri, 28 Oct 2022 13:29:35 +0100 Message-Id: <20221028122936.3717-2-mail@cbaines.net> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221028122936.3717-1-mail@cbaines.net> References: <20221028122936.3717-1-mail@cbaines.net> 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Add bash-minimal as an input fixes the interpreters for various scripts (like xzgrep and xzless) when cross-compiling. * gnu/packages/compression.scm (xz)[inputs]: Add bash-minimal when cross compiling. --- gnu/packages/compression.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index b3a678480d..672d5119be 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -529,6 +529,10 @@ (define-public xz (("^old_library='liblzma.a'") "old_library=''")) #t)))))) (outputs '("out" "static")) + (inputs + `(,@(if (%current-target-system) + `(("bash" ,bash-minimal)) + '()))) (synopsis "General-purpose data compression") (description "XZ Utils is free general-purpose data compression software with high From patchwork Fri Oct 28 12:29:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 44170 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 09C8327BBEE; Fri, 28 Oct 2022 13:35:24 +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=-3.9 required=5.0 tests=BAYES_00,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 92F9B27BBE9 for ; Fri, 28 Oct 2022 13:35:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ooOZt-0001fq-HI; Fri, 28 Oct 2022 08:35:13 -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 1ooOUt-0005NB-EJ for guix-patches@gnu.org; Fri, 28 Oct 2022 08:30:07 -0400 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 1ooOUs-0003kv-UE for guix-patches@gnu.org; Fri, 28 Oct 2022 08:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ooOUs-0005zL-PH for guix-patches@gnu.org; Fri, 28 Oct 2022 08:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58834] [PATCH 3/3] gnu: bzip2: Fix script interpreters when cross-compiling. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Oct 2022 12:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58834@debbugs.gnu.org Received: via spool by 58834-submit@debbugs.gnu.org id=B58834.166696018822959 (code B ref 58834); Fri, 28 Oct 2022 12:30:02 +0000 Received: (at 58834) by debbugs.gnu.org; 28 Oct 2022 12:29:48 +0000 Received: from localhost ([127.0.0.1]:60576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooOUe-0005yF-Gb for submit@debbugs.gnu.org; Fri, 28 Oct 2022 08:29:48 -0400 Received: from mira.cbaines.net ([212.71.252.8]:41646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ooOUV-0005xk-RY for 58834@debbugs.gnu.org; Fri, 28 Oct 2022 08:29:40 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 0C3B327BBEB for <58834@debbugs.gnu.org>; Fri, 28 Oct 2022 13:29:37 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 7a6d7235 for <58834@debbugs.gnu.org>; Fri, 28 Oct 2022 12:29:36 +0000 (UTC) From: Christopher Baines Date: Fri, 28 Oct 2022 13:29:36 +0100 Message-Id: <20221028122936.3717-3-mail@cbaines.net> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221028122936.3717-1-mail@cbaines.net> References: <20221028122936.3717-1-mail@cbaines.net> 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Add bash-minimal as an input fixes the interpreters for various scripts (like bzdiff and bzgrep) when cross-compiling. * gnu/packages/compression.scm (bzip2)[inputs]: Add bash-minimal when cross compiling. --- gnu/packages/compression.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 672d5119be..857722ef4a 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -394,6 +394,10 @@ (define-public bzip2 ,@(if (%current-target-system) '(#:tests? #f) '()))) + (inputs + `(,@(if (%current-target-system) + `(("bash" ,bash-minimal)) + '()))) (outputs '("out" "static")) (synopsis "High-quality data compression program") (description