[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
48/52: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd.
From: |
guix-commits |
Subject: |
48/52: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd. |
Date: |
Thu, 9 Apr 2020 13:29:14 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 4ba1669396f457f77902b1e9ca3a97e1ab191f0f
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 bc73e8c..722b3cb 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -194,6 +194,16 @@ $(prefix)/etc/init.d\n")))
":" (getenv "PATH"))))
#t))))
'())
+ ,@(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
- 27/52: gnu: openssl: Support cross-compilation to the Hurd., (continued)
- 27/52: gnu: openssl: Support cross-compilation to the Hurd., guix-commits, 2020/04/09
- 35/52: gnu: hurd: Add dependency on libdaemon., guix-commits, 2020/04/09
- 38/52: system: hurd: Add openssh, shepherd., guix-commits, 2020/04/09
- 37/52: gnu: openssh: Build fix for the Hurd., guix-commits, 2020/04/09
- 43/52: gnu: hurd: "/libexec/rc" spawns the console client., guix-commits, 2020/04/09
- 41/52: system: hurd: Add /etc/group., guix-commits, 2020/04/09
- 42/52: gnu: libdaemon: Cross-build with --localstatedir=/var., guix-commits, 2020/04/09
- 40/52: system: hurd: Add root profile., guix-commits, 2020/04/09
- 45/52: system: hurd: Add net-base and inetutils., guix-commits, 2020/04/09
- 39/52: gnu: guile-json: Cross-build fix., guix-commits, 2020/04/09
- 48/52: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd.,
guix-commits <=
- 51/52: DRAFT daemon: Create wrapper for mount (2)., guix-commits, 2020/04/09
- 50/52: DRAFT gnu: hurd: Add `libhurdutil' patch., guix-commits, 2020/04/09
- 46/52: system: hurd: Add guile-candy., guix-commits, 2020/04/09
- 44/52: system: hurd: Create a proper profile., guix-commits, 2020/04/09
- 47/52: system: hurd: Ensure propagated inputs are also cross-built., guix-commits, 2020/04/09
- 49/52: DRAFT gnu: guix: Cross-compilation fixup for wrap-program., guix-commits, 2020/04/09
- 52/52: HACK gnu: guix: Bump to HEAD~1: daemon: Create wrapper for mount (2)., guix-commits, 2020/04/09