From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: Git.
Date: Sun, 01 Sep 2013 21:48:47 +0200
Message-ID: <87txi4gw68.fsf@gnu.org>
References: <521FAC25.9030504@gmail.com> <20130901152708.GA5741@debian>
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]:33705)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1VGDij-0005pa-6Z
	for guix-devel@gnu.org; Sun, 01 Sep 2013 15:54:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1VGDic-0004Io-Rv
	for guix-devel@gnu.org; Sun, 01 Sep 2013 15:54:01 -0400
Received: from hera.aquilenet.fr ([141.255.128.1]:59364)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1VGDic-0004HZ-LH
	for guix-devel@gnu.org; Sun, 01 Sep 2013 15:53:54 -0400
In-Reply-To: <20130901152708.GA5741@debian> (Andreas Enge's message of "Sun, 1
	Sep 2013 17:27:08 +0200")
List-Id: <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: Andreas Enge <andreas@enge.fr>
Cc: guix-devel@gnu.org

Andreas Enge <andreas@enge.fr> skribis:

> On Thu, Aug 29, 2013 at 10:16:37PM +0200, Cyril Roelandt wrote:
>> So, I've just tried to make git work. The attached patch allows me
>> to build Git on my x86 machine, but the build fails on my x86-64
>> machine. Any idea ?
>
> For me, everything works on x86_64 and with --system=3Di686-linux.
>
> The tests fail, but a few simple operations (stash, diff, pull) on the
> guix tree work. Shall I push the attached patch despite the test failures?

Yes, please (I=E2=80=99ll try to look at the test failures, though I=E2=80=
=99m happy to
share that with someone else.)

> +        (lambda* (#:key #:allow-other-keys #:rest args)
> +          (let ((configure (assoc-ref %standard-phases 'configure)))
> +          (apply configure args)
> +          (substitute* "Makefile"
> +            (("/bin/sh") (which "sh"))
> +            (("/usr/bin/perl") (which "perl"))
> +            (("/usr/bin/python") (which "python")))))

Please indent according to scoping, and check the return value of
CONFIGURE:

  (let ((configure (...)))
    (and (apply configure args)
         (substitute* ...)))

Thanks!

Ludo=E2=80=99.