[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
36/43: gnu: guix: Cross-build fix: override compressors.
From: |
guix-commits |
Subject: |
36/43: gnu: guix: Cross-build fix: override compressors. |
Date: |
Mon, 20 Apr 2020 07:34:10 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 3dcf91547995356cf01518de915de74f5f639916
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 d77c0cb..5695d03 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -199,6 +199,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
@@ -365,7 +380,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.
- 31/43: HACK gnu: python: Disable tests on the Hurd., (continued)
- 31/43: HACK gnu: python: Disable tests on the Hurd., guix-commits, 2020/04/20
- 30/43: gnu: tcl: Disable troublesome test on the Hurd., guix-commits, 2020/04/20
- 42/43: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd., guix-commits, 2020/04/20
- 37/43: gnu: guix: Apply courage for the Hurd., guix-commits, 2020/04/20
- 18/43: services: Add hurd-user-services-service-type., guix-commits, 2020/04/20
- 33/43: gnu: guix: Use gnutls-3.6.13 when cross-compiling., guix-commits, 2020/04/20
- 27/43: system: hurd: Create system profile for guix development., guix-commits, 2020/04/20
- 29/43: guile: Disable web-server test on the Hurd., guix-commits, 2020/04/20
- 38/43: gnu: guix: Add dependency on `hurd' when building for the Hurd., guix-commits, 2020/04/20
- 39/43: gnu: guix: Avoid loading (gnu installer) when cross compiling., guix-commits, 2020/04/20
- 36/43: gnu: guix: Cross-build fix: override compressors.,
guix-commits <=
- 40/43: Revert "compile: Run the load phase within 'with-target'.", guix-commits, 2020/04/20
- 43/43: gnu: guix: Run `make update-guix-package'., guix-commits, 2020/04/20
- 34/43: gnu: guix: Fix cross-compilation., guix-commits, 2020/04/20
- 35/43: gnu: guix: Cross-build fixup for wrap-program., guix-commits, 2020/04/20
- 41/43: Revert "records: Have ABI check work well for cross-compilation.", guix-commits, 2020/04/20