janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit fc08405ddf9cb001d6ed170959bdbb83893ec476
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
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