From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: Re: 08/33: gnu: make: Revert to 4.1 for the Hurd. Date: Tue, 10 Mar 2020 09:54:28 +0100 Message-ID: <87k13sy4hn.fsf@gnu.org> References: <20200310075832.7126.86402@vcs0.savannah.gnu.org> <20200310075845.291F421123@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:49878) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBaem-0006Tu-OJ for guix-devel@gnu.org; Tue, 10 Mar 2020 04:54:33 -0400 In-Reply-To: <20200310075845.291F421123@vcs0.savannah.gnu.org> (guix-commits@gnu.org's message of "Tue, 10 Mar 2020 03:58:45 -0400 (EDT)") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org, Jan Nieuwenhuizen Hello janneke! I=E2=80=99m commenting as I see messages come by, hope that=E2=80=99s fine.= :-) guix-commits@gnu.org skribis: > commit f7804e0f00741a65e7538fe7f3f0cf9844c2165c > Author: Jan Nieuwenhuizen > AuthorDate: Wed Feb 26 20:22:18 2020 -0500 > > gnu: make: Revert to 4.1 for the Hurd. >=20=20=20=20=20 > * 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. > (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=E2=80=99t work as expected because =E2=80=98source=E2=80=99 is no = thunked, and thus (hurd-system?) is evaluated at the top level, when the module is loaded. (IOW, if you do =E2=80=9C-s i586-gnu=E2=80=9D from GNU/Linux, it= =E2=80=99ll go through the wrong arm of the =E2=80=98if=E2=80=99.) Ludo=E2=80=99.