Re: [PATCHES] Add 'file' to %final-inputs; patch /usr/bin/file

[ludo@gnu.org (Ludovic Courtès)]

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
‘check-final-inputs-self-contained.scm’ does by hand, to make 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-keys)
> +  "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’.