54/62: gnu: guix: Avoid loading (gnu installer) when cross compiling.

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit ba0e6a477213e0549b170c5e02dc6cb4c5e2bd59
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sat Apr 11 13:19:51 2020 +0200

    gnu: guix: Avoid loading (gnu installer) when cross compiling.
    
    This allows cross-compiling `guix' for the Hurd again.
    
    Commit 041c3c22dc14d485ca58b3ae1436b62d4a39d0aa
           compile: Run the load phase within 'with-target'.
    
    that helps fix the cross-compilation result _for_ the Hurd, also breaks
    cross-compiling _to_ the Hurd.
    
    It a cross-build environment
    
        ./pre-inst-env guix build --target=i586-pc-gnu guix --keep-failed 
--no-offload
    
    Doing:
    
        GUILE_LOAD_COMPILED_PATH= guild compile --target=i586-pc-gnu -L . 
gnu/ci.scm -o foo.go
        GUILE_LOAD_COMPILED_PATH= guild compile --target=i586-pc-gnu -L . 
gnu/tests/install.scm -o bar.go
    
    Give something like:
    
    WARNING: Use of `load' in declarative module (guix ui).  Add #:declarative? 
#f to your define-module invocation.
    WARNING: (guix build emacs-build-system): imported module (guix build 
utils) overrides core binding `delete'
    Backtrace:
    In ice-9/boot-9.scm:
      3297:17 19 (resolve-interface (gnu system install) #:select _ #:hide _ 
#:prefix _ #:renamer _ #:version _)
    In ice-9/threads.scm:
        390:8 18 (_ _)
    In ice-9/boot-9.scm:
      3223:13 17 (_)
    In ice-9/threads.scm:
        390:8 16 (_ _)
    In ice-9/boot-9.scm:
      3507:20 15 (_)
       2806:4 14 (save-module-excursion #<procedure 7f6220dc7cc0 at 
ice-9/boot-9.scm:3508:21 ()>)
      3527:26 13 (_)
    In unknown file:
              12 (primitive-load-path "gnu/system/install" #<procedure 
7f622318f7c0 at ice-9/boot-9.scm:3514:37 ()>)
    In ice-9/eval.scm:
       626:19 11 (_ #<directory (gnu system install) 7f6229b65780>)
       173:47 10 (_ #(#(#<directory (gnu system install) 7f6229b65780> 
#<<plain-file> name: "motd" content: "…>) …))
       196:43  9 (_ #(#(#<directory (gnu system install) 7f6229b65780> 
#<<plain-file> name: "motd" content: "…>) …))
       293:34  8 (_ #(#(#(#<directory (gnu system install) 7f6229b65780> 
#<<plain-file> name: "motd" conte…>) …) #))
        619:8  7 (_ #(#(#(#<directory (gnu installer) 7f62248f3dc0>)) 
#<variable 7f621d5d75b0 value: #<gexp (be…> …))
       626:19  6 (_ #(#(#(#<directory (gnu installer) 7f62248f3dc0>)) 
#<variable 7f621d5d75b0 value: #<gexp (be…> …))
        159:9  5 (_ #(#(#(#<directory (guix discovery) 7f62339ee280>) 
"/tmp/guix-build-guix-1.0.1-18.11fc384…" …) …))
    In srfi/srfi-1.scm:
       495:18  4 (fold-right #<procedure 7f621d786ca0 at ice-9/eval.scm:336:13 
(a b)> () _ . _)
    In ice-9/eval.scm:
       293:34  3 (_ #(#(#(#(#(#(#(#<directory (guix discovery) 7f62339ee280> 
("~^m\x18 " (. #) …) …)) …) …) …) …) …))
        155:9  2 (_ #(#(#(#(#<directory (guix discovery) 7f62339ee280>) 
"/tmp/guix-build-guix-1.0.1-18.11…" …) …) …))
    In unknown file:
               1 (lstat 
"/tmp/guix-build-guix-1.0.1-18.11fc384.drv-0/source/gnu/../gnu/installer/~^m\x18
 ")
    In ice-9/boot-9.scm:
      1669:16  0 (raise-exception _ #:continuable? _)
    
    ice-9/boot-9.scm:1669:16: In procedure raise-exception:
    In procedure lstat: No such file or directory: 
"/tmp/guix-build-guix-1.0.1-18.11fc384.drv-0/source/gnu/../gnu/installer/~^m\x18
 "
    
    * gnu/packages/package-management.scm (guix)[arguments]: When 
cross-compiling,
    add `disable-loading-gnu-installer' stage.
---
 gnu/packages/package-management.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index cdffac7..856a3d3 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -216,7 +216,15 @@ $(prefix)/etc/init.d\n")))
                                      (string-append gzip "/bin/gzip"))
                                     (("/gnu/store/.*/xz")
                                      (string-append xz "/bin/xz")))
-                                  #t))))
+                                  #t)))
+                            ;; XXX Avoid: In procedure lstat: No such file or 
directory: ".../source/gnu/../gnu/installer/~^m\x18 "
+                            (add-before 'build 'disable-loading-gnu-installer
+                              (lambda _
+                                  (substitute* "gnu/system/install.scm"
+                                    (("#:use-module \\(gnu installer\\)" all)
+                                     (string-append ";;" all))
+                                    (("\\(installer-program\\)" all)
+                                     (string-append "'" all))))))
                           '())
                     (add-before 'check 'copy-bootstrap-guile
                       (lambda* (#:key system inputs #:allow-other-keys)