[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
61/62: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd.
From: |
guix-commits |
Subject: |
61/62: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd. |
Date: |
Sat, 11 Apr 2020 11:35:59 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 4169affff3e9ada7b07c7d820a5a7549e8636737
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 1080619..e397fc7 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
- 58/62: HACK build.sh, 2GiB disk., (continued)
- 58/62: HACK build.sh, 2GiB disk., guix-commits, 2020/04/11
- 59/62: Revert "compile: Run the load phase within 'with-target'.", guix-commits, 2020/04/11
- 24/62: vm: Preserve file permissions on /dev., guix-commits, 2020/04/11
- 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 <=
- 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, 2020/04/11
- 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