[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
43/44: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd.
From: |
guix-commits |
Subject: |
43/44: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd. |
Date: |
Tue, 21 Apr 2020 15:48:30 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 8a5791e438d0cbb841bfb9c02b779c27affec781
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Tue Apr 7 22:12:54 2020 +0200
REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd.
XXX Without this hack, guix needs to be built using guile-3.0, i.e.:
guix environment guile3.0-guix; ./configure && make && ./pre-inst-env
...
<janneke> (with-target "i586-pc-gnu" target-most-positive-fixnum)
<janneke> => 2305843009213693951
* gnu/packages/package-management.scm (guix): When cross-compiling, use
hardcoded 536870911 instead of most-positive-fixnum. This fixes cross build
for the Hurd.
---
gnu/packages/package-management.scm | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index dcfe280..ba5e4b3 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -226,6 +226,16 @@ $(prefix)/etc/init.d\n")))
(("\\(installer-program\\)" all)
(string-append "'" all))))))
'())
+ ,@(if (hurd-target?)
+ ;; (with-target "i586-pc-gnu"
target-most-positive-fixnum)
+ ;; => 2305843009213693951
+ `((add-before 'build 'patch-guix/records.scm
+ (lambda _
+ (substitute* "guix/records.scm"
+ ((" most-positive-fixnum")
+ " 536870911"))
+ #t)))
+ '())
(add-before 'check 'copy-bootstrap-guile
(lambda* (#:key system inputs #:allow-other-keys)
;; Copy the bootstrap guile tarball in the store used
- 35/44: system: hurd: Add guix., (continued)
- 35/44: system: hurd: Add guix., guix-commits, 2020/04/21
- 36/44: system: hurd: Add the guix service., guix-commits, 2020/04/21
- 32/44: gnu: guix: Cross-build fix: override compressors., guix-commits, 2020/04/21
- 37/44: guile: Disable web-server test on the Hurd., guix-commits, 2020/04/21
- 40/44: gnu: guix: Avoid loading (gnu installer) when cross compiling., guix-commits, 2020/04/21
- 39/44: HACK gnu: python: Disable tests on the Hurd., guix-commits, 2020/04/21
- 42/44: Revert "records: Have ABI check work well for cross-compilation.", guix-commits, 2020/04/21
- 41/44: Revert "compile: Run the load phase within 'with-target'.", guix-commits, 2020/04/21
- 44/44: gnu: guix: Run `make update-guix-package'., guix-commits, 2020/04/21
- 38/44: gnu: tcl: Disable troublesome test on the Hurd., guix-commits, 2020/04/21
- 43/44: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd.,
guix-commits <=
- 29/44: gnu: guix: Use gnutls-3.6.13 when cross-compiling., guix-commits, 2020/04/21