Re: [PATCH] gnu: autotools: Added autoconf-2.68 and turned autoconf-wrapper into a procedure

[Ludovic Courtès]

Manolis Ragkousis <address@hidden> skribis:

> From 27f0058e7842416b374d54cdd4f21c1c82433512 Mon Sep 17 00:00:00 2001
> From: Manolis Ragkousis <address@hidden>
> Date: Mon, 24 Mar 2014 22:18:09 +0000
> Subject: [PATCH] gnu: autotools: Added autoconf-2.68 and turned
>  autoconf-wrapper into a procedure
>
> * gnu/packages/autotools.scm (autoconf-2.68): Added autoconf-2.68 for use
> with the Hurd glibc.
> * gnu/packages/autotools.scm (autoconf-wrapper): Autoconf-wrapper takes
> 'autoconf-version' as an argument.
> * gnu/packages/autotools.scm (automake): Modify inputs to use the new form.

Thanks, applied with small changes (see below.)

I adjusted the commit log to follow GNU conventions.

> +(define-public (autoconf-wrapper autoconf-version)
>    ;; An Autoconf wrapper that generates `configure' scripts that use our
>    ;; own Bash instead of /bin/sh in shebangs.  For that reason, it
>    ;; should only be used internally---users should not end up
>    ;; distributing `configure' files with a system-specific shebang.
> +  ;; The "autoconf-version" is used to determine which version to use,
> +  ;; in order to avoid duplication. If you want to use the latest version use
> +  ;; ("autoconf" ,(autoconf-wrapper "autoconf")) as an input.
>    (package (inherit autoconf)
>      (location (source-properties->location (current-source-location)))
>      (name (string-append (package-name autoconf) "-wrapper"))
> @@ -72,7 +89,9 @@ know anything about Autoconf or M4.")
>                 ;; XXX: Kludge to hide the circular dependency.
>                 ,(module-ref (resolve-interface '(gnu packages guile))
>                              'guile-2.0))
> -              ("autoconf" ,autoconf)
> +              ("autoconf" ,(match autoconf-version
> +                             ("autoconf-2.68" autoconf-2.68)
> +                             ("autoconf" autoconf)))

Passing a version string is quite inelegant and fragile, so I changed
‘autoconf-wrapper’ to instead take a package object.

So:

  (autoconf-wrapper)

returns a wrapper for the default ‘autoconf’ package, and:

  (autoconf-wrapper autoconf-2.68)

returns a wrapper for that particular version.

Thanks,
Ludo’.