bug#39699: [core-updates] gash-boot0 fails on i686-linux

[Jan Nieuwenhuizen <janneke@gnu.org>]

Ludovic Courtès writes:

Hi!

>> I would prefer 3., with the fix going upstream.  This opens the path to
>> really using bzip2 in the bootstrap.  2. could be a nice intermediate
>> step, but I would not know how to do that nicely, as we fetch
>> (compression bzip2) from upstream.  Timothy?
>
> I don’t think we’ll introduce new uses of bzip2 on the bootstrap path.
> So if it’s unnecessary today, it may remain unnecessary in the
> foreseeable future.

That's a helpful perspective; Yes, I agree.

>> See #39699
>
> Nitpick: “Fixes <https://bugs.gnu.org/39699>.”  :-)

Thanks.

>>                   (chdir "bootar")
>> +                 (when ,(equal? (%current-system) "i686-linux")
>> +                   (delete-file "scripts/bzip2.in")
>> +                   (delete-file "compression/bzip2.scm")
>> +                   (with-output-to-file "compression/bzip2.scm"
>> +                     (lambda _
>> +                       (display "(define-module (compression bzip2))
>> +(define-public is-bzip2-file? (const #f))
>> +(define-public make-bzip2-input-port (const #f))
>> +"))))
>
> Perhaps you can write it in a way that avoids rebuilds on x86_64:
>
>   ,@(if (equal? …)
>         '((…))
>         '())

Neat...

> Or actually, we can just remove the functionality unconditionally for
> now since it could be error-prone to have different features depending
> on the platform.
>
> WDYT?

Yes, I removed it.  Hoping that's okay.  We just decided above it's
adding an unnecessary "if".

@Timothy: if you want to change this in bootar itself and remove the
workaround from commencement, please feel free.  Pushed to core-updates
as

    a82cf70e8ae4c8dcf03d2633f09dcfc8bb6d6d1e

Thanks,
janneke

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