[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: 08/33: gnu: make: Revert to 4.1 for the Hurd.
From: |
Jan Nieuwenhuizen |
Subject: |
Re: 08/33: gnu: make: Revert to 4.1 for the Hurd. |
Date: |
Tue, 10 Mar 2020 10:16:20 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) |
Ludovic Courtès writes:
Hello Ludo,
> I’m commenting as I see messages come by, hope that’s fine. :-)
Sure, that's great!
> address@hidden skribis:
>
>> commit f7804e0f00741a65e7538fe7f3f0cf9844c2165c
>> Author: Jan Nieuwenhuizen <address@hidden>
>> AuthorDate: Wed Feb 26 20:22:18 2020 -0500
>>
>> gnu: make: Revert to 4.1 for the Hurd.
>>
>> * gnu/packages/base.scm (gnu-make-4.1): New variable.
>> * gnu/packages/commencement.scm (gnu-make-boot0): Use it for the Hurd.
>
> How much effort would it be to patch current Make for the Hurd? It
> would be ideal if we could apply the patch unconditionally and have a
> single Make variant.
I agree, I don't know :-) v4.3 compiles fine but apart from --help and
--version it hangs when invoked. I hoped it would be fixed after
applying the clock patches, but those only worked for Python.
We could either try to debug it or try some/all of Debian's glibc
patches. If it's already fixed by patching glibc, the only effort
involved is suffer some rebuilds. Unless you have a better idea I'll
have look at patching glibc first.
>> (define gnu-make-boot0
>> (package
>> (inherit gnu-make)
>> - (source (bootstrap-origin (package-source gnu-make)))
>> + (version (if (hurd-system?) "4.1"
>> + (package-version gnu-make)))
>> + (source (if (hurd-system?)
>> + (bootstrap-origin (package-source gnu-make-4.1))
>> + (bootstrap-origin (package-source gnu-make))))
>
> This won’t work as expected because ‘source’ is no thunked, and thus
> (hurd-system?) is evaluated at the top level, when the module is
> loaded. (IOW, if you do “-s i586-gnu” from GNU/Linux, it’ll go through
> the wrong arm of the ‘if’.)
Ah, crap! It seemed to work natively and with -t i586-pc-gnu ... (-s
won't work anyway, right?) Hmm.
janneke
--
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com