[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/36: gnu: guix: Cross-build fix: override compressors.
From: |
guix-commits |
Subject: |
09/36: gnu: guix: Cross-build fix: override compressors. |
Date: |
Fri, 24 Apr 2020 08:14:07 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit cd3193fff572c11197d8083fac50a1e0a89f2745
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 | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index 43b0920..05e4cfb 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -191,6 +191,20 @@ $(prefix)/etc/init.d\n")))
(bash (assoc-ref inputs "bash")))
(substitute* (string-append out "/bin/guix")
(("^#!.*/bash") (string-append "#! " bash
"/bin/bash")))
+ #t)))
+ (add-before 'build 'fixup-compressors
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Use host compressors.
+ (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
(lambda* (#:key system inputs #:allow-other-keys)
@@ -342,7 +356,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))
'())
;; Tests also rely on these bootstrap executables.
- branch wip-hurd-vm created (now 6c9efcd), guix-commits, 2020/04/24
- 04/36: gnu: guix: Do not copy bootstrap-guile when cross-compiling., guix-commits, 2020/04/24
- 01/36: compile: Pre-load the compiler outside 'with-target'., guix-commits, 2020/04/24
- 09/36: gnu: guix: Cross-build fix: override compressors.,
guix-commits <=
- 07/36: gnu: guix: Cross-build fixup for wrap-program., guix-commits, 2020/04/24
- 05/36: gnu: guix: Indent `copy-bootstrap-guile' code., guix-commits, 2020/04/24
- 06/36: gnu: guix: Cross-build workaround: Run native guile for version., guix-commits, 2020/04/24
- 14/36: gnu: hurd: Use default Qemu guest ip: 10.0.2.15., guix-commits, 2020/04/24
- 10/36: gnu: guix: Run `make update-guix-package'., guix-commits, 2020/04/24
- 11/36: vm: Make the device node procedure a parameter., guix-commits, 2020/04/24
- 12/36: gnu: hurd: Build DDE libraries., guix-commits, 2020/04/24
- 17/36: gnu: hurd: Add NFS support., guix-commits, 2020/04/24
- 19/36: system: hurd: Add less, which to %base-packages/hurd., guix-commits, 2020/04/24
- 03/36: gnu: guix: Apply courage for the Hurd., guix-commits, 2020/04/24