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

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

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 351 bytes --]

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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

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

[Christopher Baines]

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
-- 
2.37.3

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

[Christopher Baines]

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
-- 
2.37.3

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

[Christopher Baines]

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
-- 
2.37.3

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

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 512 bytes --]


Christopher Baines <mail@cbaines.net> writes:

> [[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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]