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: autotools: Added autoconf-2.68 and turned autoconf-wrapper into a procedure Date: Tue, 25 Mar 2014 00:02:43 +0100 Message-ID: <87eh1rkxnw.fsf@gnu.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSDtP-00089n-4A for Guix-devel@gnu.org; Mon, 24 Mar 2014 19:03:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSDtG-0006ld-MO for Guix-devel@gnu.org; Mon, 24 Mar 2014 19:02:55 -0400 Received: from hera.aquilenet.fr ([2a01:474::1]:46695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSDtG-0006jB-Fj for Guix-devel@gnu.org; Mon, 24 Mar 2014 19:02:46 -0400 In-Reply-To: (Manolis Ragkousis's message of "Mon, 24 Mar 2014 20:48:48 +0000") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Manolis Ragkousis Cc: Guix-devel@gnu.org Manolis Ragkousis skribis: > From 27f0058e7842416b374d54cdd4f21c1c82433512 Mon Sep 17 00:00:00 2001 > From: Manolis Ragkousis > 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 for= m. 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 versio= n 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 =E2=80=98autoconf-wrapper=E2=80=99 to instead take a package object. So: (autoconf-wrapper) returns a wrapper for the default =E2=80=98autoconf=E2=80=99 package, and: (autoconf-wrapper autoconf-2.68) returns a wrapper for that particular version. Thanks, Ludo=E2=80=99.