Subject: [bug#38069] [PATCH]: Adjust make-bootstrap linux headers

From: Ludovic Courtès <[email-masked]>
Date: Fri, 15 Nov 2019 17:35:48 +0100

Hello,

Efraim Flashner <[email-masked]> skribis:

> From 1a4f163ca174d5edc09db0dacd2ff188ee4cc1ae Mon Sep 17 00:00:00 2001
> From: Efraim Flashner <[email-masked]>
> 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 "/include/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 ‘install-file’?

Thanks,
Ludo’.