Preparing the reduced bootstrap tarballs, take 2

[Jan Nieuwenhuizen]

Hello!

Meanwhile, I have updated core-updates-next to include

    d9ed0a463 bootstrap: Update %bootstrap-tarballs.
    4fd4efc81 bootstrap: Replace %mescc-tools-seed with %bootstrap-mescc-tools.
    562c37c7b bootstrap: Update %bootstrap-mes.
    b00a95be2 bootstrap: Add %bootstrap-mescc-tools.

With these, I can build

   ./pre-inst-env guix build hello
   ./pre-inst-env guix build --system=i686-linux hello
   ./pre-inst-env guix build --system=i686-linux bootstrap-tarballs

If these reproduce, we're getting real close.  However...

On my core-updates-next at gitlab I also have (see attached)

    5c2209ad4 bootstrap: Force i686-linux for bootstrap-tarballs.

which tries to support

   ./pre-inst-env guix build bootstrap-tarballs

which fails when attempting to build 
gcc-cross-sans-libc-i686-unknown-linux-gnu-5.5.0

    
/tmp/guix-build-gcc-cross-sans-libc-i686-unknown-linux-gnu-5.5.0.drv-0/build/./gcc/cc1:
 error while loading shared libraries: libisl.so.15: cannot open shared object 
file: No such file or directory

I do not understand the dependency chain of why exactly this is being
rebuilt and what %current-system is, or why it fails.

janneke

>From 5c2209ad4edd198f600dbf1fef58d434cd3bd92a Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <address@hidden>
Date: Tue, 20 Nov 2018 08:12:09 +0100
Subject: [PATCH] bootstrap: Force i686-linux for bootstrap-tarballs.

* gnu/packages/make-bootstrap.scm (%mescc-tools-static): Force i686-linux for
bootstrap-tarballs.
(%mes-minimal): Likewise.
* gnu/packages/commencement.scm (mes-boot): Support strict i686-linux build on
x86_64.
---
 gnu/packages/commencement.scm   |  2 ++
 gnu/packages/make-bootstrap.scm | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index ed8a429c2..3d3f8e665 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -174,6 +174,8 @@
                 (symlink (string-append "../nyacc-source/module") "nyacc")
                 (setenv "GUILE_LOAD_PATH" "nyacc")
                 (setenv "GUILE_TOOLS" "true") ; no tools in bootstrap-guile
+                (substitute* "configure.sh"
+                  (("^arch=.*") "arch=i686\n"))
                 (invoke "bash" "configure.sh"
                         (string-append "--prefix=" out))
                 (setenv "MES" "src/mes")
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index fa3914cde..d75289b45 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -542,9 +542,10 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
     (inherit mescc-tools)
     (name "mescc-tools-static")
     (arguments
-     (substitute-keyword-arguments (package-arguments mescc-tools)
-       ((#:make-flags flags)
-        `(cons "CC=gcc -static" ,flags))))))
+     `(#:system "i686-linux"
+       ,@(substitute-keyword-arguments (package-arguments mescc-tools)
+           ((#:make-flags flags)
+            `(cons "CC=gcc -static" ,flags)))))))
 
 (define %mes-minimal
   ;; A minimal Mes without documentation dependencies, for bootstrap.
@@ -562,7 +563,8 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                  ("i686-linux-gcc" ,(cross-gcc triplet)))
                '())))
       (arguments
-       `(#:strip-binaries? #f
+       `(#:system "i686-linux"
+         #:strip-binaries? #f
          #:phases
          (modify-phases %standard-phases
            (add-before 'configure 'optional-dot
-- 
2.19.1

-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com