From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:54204)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1iVeZn-0003i2-2d
 for guix-patches@gnu.org; Fri, 15 Nov 2019 11:36:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1iVeZl-000770-VE
 for guix-patches@gnu.org; Fri, 15 Nov 2019 11:36:02 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:56690)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1iVeZl-00076q-S1
 for guix-patches@gnu.org; Fri, 15 Nov 2019 11:36:01 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1iVeZl-0001Cc-Nf
 for guix-patches@gnu.org; Fri, 15 Nov 2019 11:36:01 -0500
Subject: [bug#38069] [PATCH]: Adjust make-bootstrap linux headers
Resent-Message-ID: <handler.38069.B38069.15738357604615@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
References: <20191105125633.GA14453@E5400>
Date: Fri, 15 Nov 2019 17:35:48 +0100
In-Reply-To: <20191105125633.GA14453@E5400> (Efraim Flashner's message of
 "Tue, 5 Nov 2019 14:56:33 +0200")
Message-ID: <87r229yu57.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Efraim Flashner <efraim@flashner.co.il>
Cc: 38069@debbugs.gnu.org, Jan Nieuwenhuizen <janneke@gnu.org>

Hello,

Efraim Flashner <efraim@flashner.co.il> skribis:

> From 1a4f163ca174d5edc09db0dacd2ff188ee4cc1ae Mon Sep 17 00:00:00 2001
> From: Efraim Flashner <efraim@flashner.co.il>
> Date: Tue, 5 Nov 2019 14:55:05 +0200
> Subject: [PATCH] make-bootstrap: Adjust copied linux headers.
>
> * guix/build/make-bootstrap.scm (copy-linux-headers): Remove header
> file 'a.out.h' is no longer part of the linux kernel headers.
> ---
>  guix/build/make-bootstrap.scm | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm
> index e5ef1d6d2b..0d29338ce3 100644
> --- a/guix/build/make-bootstrap.scm
> +++ b/guix/build/make-bootstrap.scm
> @@ -47,7 +47,6 @@ bootstrap libc."
>                  (install-file (pk 'src (string-append kernel-headers "/i=
nclude/linux/" file))
>                                (pk 'dest (string-append incdir "/linux"))=
))
>                '(
> -                "a.out.h"               ; for 2.2.5

Looking at the comment here, which was added by Janneke, I suspect this
header is actually required to build glibc 2.2.5 in commencement.scm.
Did I get it right, Janneke?

If so, perhaps we should reinstate it and simply add a

  when (file-exists? file)

guard before calling =E2=80=98install-file=E2=80=99?

Thanks,
Ludo=E2=80=99.