[PATCH 0/3] Fix some scripts in compression packages when cross-compiling

Done

Details

One participant

Christopher Baines

Owner: unassigned

Submitted by: Christopher Baines

Severity: normal

Debbugs page

Christopher Baines wrote 2 years ago

Recipients:(address . guix-patches@gnu.org)

Message-ID:871qqs6sz7.fsf@cbaines.net

I noticed these are broken on the Hurd.

Christopher Baines (3):

gnu: gzip: Fix script interpreters when cross-compiling.

gnu: xz: Fix script interpreters when cross-compiling.

gnu: bzip2: Fix script interpreters when cross-compiling.

gnu/packages/compression.scm | 13 +++++++++++++

1 file changed, 13 insertions(+)

2.37.3

Christopher Baines wrote 2 years ago

[PATCH 1/3] gnu: gzip: Fix script interpreters when cross-compiling.

Recipients:(address . 58834@debbugs.gnu.org)

Message-ID:20221028122936.3717-1-mail@cbaines.net

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(+)

Toggle diff (25 lines)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
-- 
2.37.3

Christopher Baines wrote 2 years ago

[PATCH 2/3] gnu: xz: Fix script interpreters when cross-compiling.

Recipients:(address . 58834@debbugs.gnu.org)

Message-ID:20221028122936.3717-2-mail@cbaines.net

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(+)

Toggle diff (17 lines)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
-- 
2.37.3

Christopher Baines wrote 2 years ago

[PATCH 3/3] gnu: bzip2: Fix script interpreters when cross-compiling.

Recipients:(address . 58834@debbugs.gnu.org)

Message-ID:20221028122936.3717-3-mail@cbaines.net

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(+)

Toggle diff (17 lines)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
-- 
2.37.3

Christopher Baines wrote 2 years ago

Re: [bug#58834] [PATCH 0/3] Fix some scripts in compression packages when cross-compiling

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 58834-done@debbugs.gnu.org)

Message-ID:87fsf7ggwx.fsf@cbaines.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (11 lines)> [[PGP Signed Part:Undecided]]
> I noticed these are broken on the Hurd.
>
> Christopher Baines (3):
>   gnu: gzip: Fix script interpreters when cross-compiling.
>   gnu: xz: Fix script interpreters when cross-compiling.
>   gnu: bzip2: Fix script interpreters when cross-compiling.
>
>  gnu/packages/compression.scm | 13 +++++++++++++
>  1 file changed, 13 insertions(+)

I've gone ahead and pushed these changes now as

e4fcb6d1b3ca7346123deb14f10b724b15ff06b1.

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 58834@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 58834

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags

mumi command -t +confirmed -t +easy

Or, remove the moreinfo tag and set the help tag

mumi command -t -moreinfo -t +help

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date