janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 0466666b26ace00f72e233d6291deed9e8f41f45
Author: Jan (janneke) Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Tue Apr 7 18:17:19 2020 +0200
HACK gnu: guix: Partial fix for running cross-compiled guix build.
This reduces, running on the Hurd:
$ guix build hello
guix build: warning: failed to load '(gnu packages abduco)':
In procedure abi-check: #<record-type <build-system>>: record ABI
mismatch; recompilation needed
guix build: warning: failed to load '(gnu packages abiword)':
In procedure abi-check: #<record-type <build-system>>: record ABI
mismatch; recompilation needed
guix build: warning: failed to load '(gnu packages accessibility)':
In procedure abi-check: #<record-type <build-system>>: record ABI
mismatch; recompilation needed
guix build: warning: failed to load '(gnu packages acct)':
In procedure abi-check: #<record-type <origin>>: record ABI mismatch;
recompilation needed
guix build: warning: failed to load '(gnu packages acl)':
...~500 more
In procedure abi-check: #<record-type <origin>>: record ABI mismatch;
recompilation needed
guix build: warning: failed to load '(gnu packages zwave)':
In procedure abi-check: #<record-type <git-reference>>: record ABI
mismatch; recompilation needed
guix build: error: hello: unknown package
to only 80 lines:
guix build: warning: failed to load '(gnu packages abiword)':
In procedure abi-check: #<record-type <package>>: record ABI mismatch;
recompilation needed
guix build: warning: failed to load '(gnu packages accessibility)':
In procedure abi-check: #<record-type <package>>: record ABI mismatch;
recompilation needed
guix build: warning: failed to load '(gnu packages android)':
In procedure abi-check: #<record-type <package>>: record ABI mismatch;
recompilation needed
error: bzip2: unbound variable
....~80 more
guix build: warning: failed to load '(gnu packages sagemath)':
In procedure abi-check: #<record-type <package>>: record ABI mismatch;
recompilation needed
error: curl: unbound variable
hint: Did you forget a `use-modules' form?
guix build: error: hello: unknown package
* gnu/packages/package-management.scm (guix): When cross-compiling,
use target-most-positive-fixnum from (system base target). This
fixes cross build for the Hurd.
---
gnu/packages/package-management.scm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index 9a7ca0d..c06f389 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -192,7 +192,13 @@ $(prefix)/etc/init.d\n")))
(string-append "LANGUAGE= PATH="
self "/bin"
":" (getenv "PATH"))))
- #t))))
+ #t)))
+ (add-before 'build 'patch-guix/records.scm
+ (lambda _
+ (substitute* "guix/records.scm"
+ ((" most-positive-fixnum")
+ " ((@ (system base target)
target-most-positive-fixnum))"))
+ #t)))
'())
(add-before 'check 'copy-bootstrap-guile
(lambda* (#:key system inputs #:allow-other-keys)
