From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: [PATCH] gnu: make-bootstrap: Produce the correct
	%glibc-bootstrap-tarball for Hurd systems.
Date: Tue, 26 Jul 2016 16:44:09 +0200
Message-ID: <87invs793a.fsf@gnu.org>
References: <bdbf1506-8b27-dd18-284b-ce8bc2f1c17b@gmail.com>
	<fc10f3ef-3d88-68fd-c5d0-fa1dc125f4ce@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38078)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1bS3ai-0003nI-B2
	for guix-devel@gnu.org; Tue, 26 Jul 2016 10:44:17 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1bS3ae-0002e9-B6
	for guix-devel@gnu.org; Tue, 26 Jul 2016 10:44:16 -0400
In-Reply-To: <fc10f3ef-3d88-68fd-c5d0-fa1dc125f4ce@gmail.com> (Manolis
	Ragkousis's message of "Tue, 26 Jul 2016 16:41:36 +0300")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: Manolis Ragkousis <manolis837@gmail.com>
Cc: guix-devel@gnu.org

Hello!

Manolis Ragkousis <manolis837@gmail.com> skribis:

> From a8541a554f9e1653c78b6b45f323426e330d5215 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <manolis837@gmail.com>
> Date: Mon, 25 Jul 2016 16:53:40 +0300
> Subject: [PATCH] gnu: make-bootstrap: Produce the correct
>  %glibc-bootstrap-tarball for Hurd systems.
>
> * gnu/packages/make-bootstrap.scm (%glibc-bootstrap-tarball): Make it a p=
rocedure.
>   (%glibc-stripped): Make it a procedure and move the kernel specific par=
t from
>   here to ...
> * guix/build/make-bootstrap.scm (make-stripped-libc): ... here. New file.
> * Makefile.am (MODULES): Add it.

I like this new (guix build make-bootstrap) module!

It would be ideal if the part that introduces this module were a patch
separate from the Hurd part.  However, that=E2=80=99s too much of a trouble=
 to
split the patch, it=E2=80=99s fine this way.

> +(define (make-stripped-libc output libc kernel-headers)
> +  "Copy to OUTPUT the subset of LIBC and KERNEL-HEADERS that is needed
> +   when producing a bootstrap libc."
      ^
Please align to the left.

> +      (for-each (lambda (file)
> +                  (copy-file (string-append kernel-headers "/include/lin=
ux/" file)
> +                             (string-append incdir "/linux/"
> +                                            (basename file))))

This could be written as:

  (install-file (string-append kernel-headers "/include/linux/" file)
                (string-append incdir "/linux"))

> +              (find-files (string-append libc "/lib")
> +                          "^(crt.*|ld.*|lib(c|m|dl|rt|pthread|nsl|util).=
*\\.so(\\..*)?|\
> +lib(machuser|hurduser).so.*|libc(rt|)_nonshared\\.a)$"))

Maybe move the regexp to a separate variable for clarity, like:

  (define %libc-object-files-rx "^=E2=80=A6")

Otherwise LGTM!

Thanks!

Ludo=E2=80=99.