[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/22: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd.
From: |
guix-commits |
Subject: |
06/22: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd. |
Date: |
Mon, 13 Apr 2020 09:20:46 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 3277c2bf1abf6a3e17a5261bac9dca79cb0b75d5
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 7165edf..66c71a3 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
- branch wip-hurd-vm updated (784ba72 -> ef33718), guix-commits, 2020/04/13
- 01/22: gnu: guix: Avoid loading (gnu installer) when cross compiling., guix-commits, 2020/04/13
- 07/22: gnu: guix: Run `make update-guix-package'., guix-commits, 2020/04/13
- 10/22: gnu: hurd: Use default Qemu guest ip: 10.0.2.15., guix-commits, 2020/04/13
- 03/22: HACK build.sh, 2GiB disk., guix-commits, 2020/04/13
- 05/22: Revert "records: Have ABI check work well for cross-compilation.", guix-commits, 2020/04/13
- 02/22: system: hurd: Add guix., guix-commits, 2020/04/13
- 06/22: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd.,
guix-commits <=
- 04/22: Revert "compile: Run the load phase within 'with-target'.", guix-commits, 2020/04/13
- 08/22: build.sh: Disable daemon deduplication; builds gnu-make-boot0!, guix-commits, 2020/04/13
- 09/22: system: hurd: Bump image size to 10GiB., guix-commits, 2020/04/13
- 12/22: system: hurd: Add the Shepherd., guix-commits, 2020/04/13
- 11/22: system: hurd: Add openssh., guix-commits, 2020/04/13
- 15/22: DRAFT system: hurd: Start the Shepherd., guix-commits, 2020/04/13
- 18/22: services: Add hurd-ttys-service-type., guix-commits, 2020/04/13
- 14/22: gnu: python: Build fix for the Hurd., guix-commits, 2020/04/13
- 20/22: services: Register guix-daemon-service as a hurd service., guix-commits, 2020/04/13
- 16/22: services: Add hurd., guix-commits, 2020/04/13