[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
53/62: gnu: guix: Cross-build fix: override compressors.
From: |
guix-commits |
Subject: |
53/62: gnu: guix: Cross-build fix: override compressors. |
Date: |
Sat, 11 Apr 2020 11:35:56 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit a1835591a6ea0d3c0d5353da293fbf5c665b3d44
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Fri Apr 10 21:24:19 2020 +0200
gnu: guix: Cross-build fix: override compressors.
* gnu/packages/package-management.scm (guix)[arguments]: When
cross-compiling,
add `fixup-compressors' stage.
[inputs]: When cross-compiling, add `xz'.
---
gnu/packages/package-management.scm | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index e1af9aa..cdffac7 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -201,6 +201,21 @@ $(prefix)/etc/init.d\n")))
(bash (assoc-ref inputs "bash")))
(substitute* (string-append out "/bin/guix")
(("^#!.*/bash") (string-append "#! " bash
"/bin/bash")))
+ #t)))
+ ;; Use host compressors.
+ (add-before 'build 'fixup-compressors
+ (lambda* (#:key inputs #:allow-other-keys)
+ (format #t "FOO: inputs:~s\n" inputs)
+ (let ((bzip2 (assoc-ref inputs "bzip2"))
+ (gzip (assoc-ref inputs "gzip"))
+ (xz (assoc-ref inputs "xz")))
+ (substitute* "guix/config.scm"
+ (("/gnu/store/.*/bzip2")
+ (string-append bzip2 "/bin/bzip2"))
+ (("/gnu/store/.*/gzip") gzip
+ (string-append gzip "/bin/gzip"))
+ (("/gnu/store/.*/xz")
+ (string-append xz "/bin/xz")))
#t))))
'())
(add-before 'check 'copy-bootstrap-guile
@@ -367,7 +382,8 @@ $(prefix)/etc/init.d\n")))
`(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux")))
'())
,@(if (%current-target-system)
- `(("bash" ,bash-minimal))
+ `(("bash" ,bash-minimal)
+ ("xz" ,xz))
'())
,@(if (hurd-target?)
`(("hurd" ,hurd)) ;for `libhurdutil' XXX TODO: hurd-headers +
- 29/62: linux-boot: Add 'make-hurd-device-nodes'., (continued)
- 29/62: linux-boot: Add 'make-hurd-device-nodes'., guix-commits, 2020/04/11
- 31/62: gnu: guix: Fix cross-compilation., guix-commits, 2020/04/11
- 37/62: gnu: openssh: Build fix for the Hurd., guix-commits, 2020/04/11
- 33/62: gnu: libdaemon: Allow cross-compilation., guix-commits, 2020/04/11
- 43/62: gnu: hurd: "/libexec/rc" spawns the console client., guix-commits, 2020/04/11
- 44/62: system: hurd: Create a proper profile., guix-commits, 2020/04/11
- 45/62: system: hurd: Add net-base and inetutils., guix-commits, 2020/04/11
- 61/62: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd., guix-commits, 2020/04/11
- 57/62: DRAFT daemon: Create wrapper for mount (2)., guix-commits, 2020/04/11
- 60/62: Revert "records: Have ABI check work well for cross-compilation.", guix-commits, 2020/04/11
- 53/62: gnu: guix: Cross-build fix: override compressors.,
guix-commits <=
- 56/62: DRAFT gnu: hurd: Add `libhurdutil' patch., guix-commits, 2020/04/11
- 26/62: gnu: libgcrypt: Fix cross-compilation., guix-commits, 2020/04/11
- 27/62: gnu: openssl: Support cross-compilation to the Hurd., guix-commits, 2020/04/11
- 28/62: gnu: guix: Apply courage for the Hurd., guix-commits, 2020/04/11
- 41/62: system: hurd: Add /etc/group., guix-commits, 2020/04/11
- 40/62: system: hurd: Add root profile., guix-commits, 2020/04/11
- 49/62: gnu: guix: Use gnutls-3.6.13 when cross-compiling., guix-commits, 2020/04/11
- 42/62: gnu: libdaemon: Cross-build with --localstatedir=/var., guix-commits, 2020/04/11
- 55/62: gnu: guix: Run `make update-guix-package'., guix-commits, 2020/04/11
- 54/62: gnu: guix: Avoid loading (gnu installer) when cross compiling., guix-commits, 2020/04/11