From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: [PATCHES] Add 'file' to %final-inputs; patch /usr/bin/file
Date: Fri, 22 Aug 2014 11:09:13 +0200
Message-ID: <87iolk51s6.fsf@gnu.org>
References: <87mwazasyc.fsf@netris.org> <877g22978h.fsf@gnu.org>
	<87iollbzkm.fsf_-_@netris.org> <878umhaw7t.fsf@netris.org>
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]:38328)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1XKkqX-0004zX-2f
	for guix-devel@gnu.org; Fri, 22 Aug 2014 05:09:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1XKkqR-0006ip-3p
	for guix-devel@gnu.org; Fri, 22 Aug 2014 05:09:21 -0400
Received: from hera.aquilenet.fr ([2a01:474::1]:42074)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1XKkqQ-0006il-SJ
	for guix-devel@gnu.org; Fri, 22 Aug 2014 05:09:15 -0400
In-Reply-To: <878umhaw7t.fsf@netris.org> (mhw@netris.org's message of "Fri, 22
	Aug 2014 02:12:54 -0400")
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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: mhw@netris.org
Cc: guix-devel@gnu.org

mhw@netris.org skribis:

> From 554d86b02c75922a1c05b5e65cfccd3cc8bd23db Mon Sep 17 00:00:00 2001
> From: Mark H Weaver <mhw@netris.org>
> Date: Thu, 21 Aug 2014 11:26:40 -0400
> Subject: [PATCH 1/3] gnu: bootstrap: Add 'file' to %boot0-inputs and
>  %final-inputs.
>
> * gnu/packages/base.scm (file-boot0): New variable.
>   (%boot0-inputs): Add 'file-boot0'.
>   (%final-inputs): Add 'file' to list of packages to 'finalize'.

LGTM.

Please try to do the same check that
=E2=80=98check-final-inputs-self-contained.scm=E2=80=99 does by hand, to ma=
ke sure
nothing is breaking here.

> From 883f77d92f5b1e8af294f88abea0b09487fb901b Mon Sep 17 00:00:00 2001
> From: Mark H Weaver <mhw@netris.org>
> Date: Thu, 21 Aug 2014 11:30:08 -0400
> Subject: [PATCH 2/3] gnu-build-system: Add 'patch-usr-bin-file' to
>  %standard-phases.
>
> * guix/build/gnu-build-system.scm (patch-usr-bin-file): New procedure.
>   (%standard-phases): Add it.

[...]

> +(define* (patch-usr-bin-file #:key native-inputs inputs #:allow-other-ke=
ys)
> +  "Patch occurrences of /usr/bin/file in configure, if present."

Please add a link to the Libtool bug report.

Also, for convenience, it might help to add a #:patch-/usr/bin/file?
keyword parameter.

> From 6818e2a6e53afa7b90379a4a99f014308c8cd2ee Mon Sep 17 00:00:00 2001
> From: Mark H Weaver <mhw@netris.org>
> Date: Thu, 21 Aug 2014 22:39:18 -0400
> Subject: [PATCH 3/3] gnu: Rely on 'file' implicit input and
>  'patch-usr-bin-file'.
>
> * gnu/packages/admin.scm (sudo):
> * gnu/packages/gawk.scm (gawk): Remove workaround on MIPS.
>
> * gnu/packages/mcrypt.scm (mcrypt, libmhash):
> * gnu/packages/file.scm (file): Remove 'file' from native-inputs.
>
> * gnu/packages/mc.scm (mc):
> * gnu/packages/pretty-print.scm (a2ps, trueprint, source-highlight):
> * gnu/packages/image.scm (libtiff): Remove 'file' from native-inputs.
>   Remove 'patch-configure' phase.

OK.

Thanks for all this!

Ludo=E2=80=99.