From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEL55-00077A-Px for guix-patches@gnu.org; Sun, 21 Oct 2018 17:16:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEKz5-0004nm-46 for guix-patches@gnu.org; Sun, 21 Oct 2018 17:10:04 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:58675) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gEKz4-0004nW-8G for guix-patches@gnu.org; Sun, 21 Oct 2018 17:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gEKz4-0002Yz-2b for guix-patches@gnu.org; Sun, 21 Oct 2018 17:10:02 -0400 Subject: [bug#33038] [PATCH 3/6] bootstrap: Add %bootstrap-mes. Resent-Message-ID: From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20181014085857.3863-1-janneke@gnu.org> <20181014085857.3863-3-janneke@gnu.org> <87r2gld3nt.fsf@gnu.org> <875zxxax4f.fsf@gnu.org> Date: Sun, 21 Oct 2018 23:09:16 +0200 In-Reply-To: <875zxxax4f.fsf@gnu.org> (Jan Nieuwenhuizen's message of "Sat, 20 Oct 2018 09:35:44 +0200") Message-ID: <87sh0z6m83.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Jan Nieuwenhuizen Cc: 33038@debbugs.gnu.org Hi! Jan Nieuwenhuizen skribis: > Ludovic Court=C3=A8s writes: [...] >> Please move the =E2=80=98use-modules=E2=80=99 form to the top level (non= -top-level >> =E2=80=98use-modules=E2=80=99 works pretty much by chance). > > Sure, do you mean like this? > > $ git diff -w > diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm > index f33fc061e..f43e405f8 100644 > --- a/gnu/packages/bootstrap.scm > +++ b/gnu/packages/bootstrap.scm > @@ -623,12 +623,13 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ > `(#:guile ,%bootstrap-guile > #:modules ((guix build utils)) > #:builder > + (begin > + (use-modules (guix build utils) > + (ice-9 popen)) > (let ((out (assoc-ref %outputs "out")) > (tar (assoc-ref %build-inputs "tar")) > (xz (assoc-ref %build-inputs "xz")) > (tarball (assoc-ref %build-inputs "tarball"))) > - (use-modules (guix build utils) > - (ice-9 popen)) >=20=20 > (mkdir out) > (copy-file tarball "binaries.tar.xz") Exactly. > I copied this from %bootstrap-gcc, do we want to to change this in all > bootstrap packages too? Yes, we should do that while we=E2=80=99re at it. > Ah yes, that's nice. Hmm, there's a slight complication because for the > i686-linux version I cheated; icu4c, python-more-itertools and swig fail > to build on core-updates-next. I added a hack and reverted that... > which is probably less than great. So I cleaned it up a bit and just > added it. > > So, now we three commits instead of this single one > > 0001-bootstrap-Add-mes-stripped-mes-bootstrap-tarball.patch > 0002-bootstrap-FTBFS-hack-for-icu4c-python-more-itertools.patch > 0003-bootstrap-Add-bootstrap-mes.patch > > > (attached, and also on my gitlab core-updates-next. Now for a > rebuild... Heh. :-) Well there=E2=80=99s the option of merging core-updates as Marius suggested, though that will mean yet another (partial) rebuild, so you=E2=80=99d have = to be patient. WDYT? > From 04c237218d10756582e6dce5763eaca9704d13cf Mon Sep 17 00:00:00 2001 > From: Jan Nieuwenhuizen > Date: Sat, 20 Oct 2018 09:02:39 +0200 > Subject: [PATCH 3/3] bootstrap: Add %bootstrap-mes. >=20 > This include bootstrap seeds >=20 > mes-stripped-0.18-0.08f04f5-x86_64-linux.tar.xz > 14sbcm79ml4rgygxvx1135827g3ggfx1c1vchk77z26yibbdw9nh >=20 > mes-stripped-0.18-0.08f04f5-i686-linux.tar.xz > 1p116ya9n52852bryh34n7db4mhvi98qifmmwygl7nbyc4dz92jy I think this info is not necessary here since those hashes appear in the file. > built with the previous commit >=20 > dea5dfa03 bootstrap: FTBFS hack for icu4c, python-more-itertools, swi= g. In the final commit please write the full rather than the abbreviated commit hash. Anyway LGTM modulo maybe one rebuild and commit log tweak. Thank you! Ludo=E2=80=99.