From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
Subject: bug#21987: Version 0.9 Fails to Compile on Raspbian
Date: Tue, 24 Nov 2015 10:03:21 +0100
Message-ID: <874mgbixba.fsf@gnu.org>
References: <56524494.5060507@softf1.com> <87d1v0srpq.fsf@gnu.org>
	<56538E5A.60907@softf1.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Return-path: <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48313)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1a19X9-0001P7-C1
	for bug-guix@gnu.org; Tue, 24 Nov 2015 04:05:08 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1a19X4-0002BX-NG
	for bug-guix@gnu.org; Tue, 24 Nov 2015 04:05:07 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:60558)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1a19X4-0002BT-Kh
	for bug-guix@gnu.org; Tue, 24 Nov 2015 04:05:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1a19X4-0005xC-9D
	for bug-guix@gnu.org; Tue, 24 Nov 2015 04:05:02 -0500
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-Message-ID: <handler.21987.B21987.144835585022825@debbugs.gnu.org>
In-Reply-To: <56538E5A.60907@softf1.com> (Martin Vahi's message of "Tue, 24
	Nov 2015 00:08:26 +0200")
List-Id: Bug reports for GNU Guix <bug-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-guix>
List-Post: <mailto:bug-guix@gnu.org>
List-Help: <mailto:bug-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=subscribe>
Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
Sender: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
To: Martin Vahi <martin.vahi@softf1.com>
Cc: 21987@debbugs.gnu.org

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

(Please keep 21987@debbugs.gnu.org Cc=E2=80=99d.)

Martin Vahi <martin.vahi@softf1.com> skribis:

> checking build system type... armv6l-unknown-linux-gnueabihf
> checking host system type... armv6l-unknown-linux-gnueabihf

[...]

> checking for the Guix system type... armhf-linux

This is the problem: =E2=80=98configure=E2=80=99 should bail out when it en=
counters
=E2=80=9Carmv6l=E2=80=9D.  I believe the patch below solves that.

The triplet we pass to =E2=80=98./configure --build=E2=80=99 starts with =
=E2=80=9Carm-=E2=80=9D
(computed from =E2=80=98nix-system->gnu-triplet=E2=80=99.)  However, when r=
unning
config.guess outside of the Guix environment on hydra-slave1, I get
=E2=80=9Carmv7l=E2=80=9D.  So I think we have to allow both.

Mark?

Thanks,
Ludo=E2=80=99.


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline

diff --git a/m4/guix.m4 b/m4/guix.m4
index 842249a..4f586b6 100644
--- a/m4/guix.m4
+++ b/m4/guix.m4
@@ -51,7 +51,12 @@ AC_DEFUN([GUIX_SYSTEM_TYPE], [
           machine_name="i686";;
        amd64)
           machine_name="x86_64";;
-       arm*)
+       arm|armv7*)
+          # Here we want to exclude CPUs such as "armv6l".  On ARMv7
+          # machines, we normally get "armv7l".  However, in Guix, we
+          # configure with --build=arm-unknown-linux-gnueabihf, leading
+          # to just "arm", so we also have to allow it.
+          #
           # TODO: If not cross-compiling, add a sanity check to make
           #       sure this build machine has the needed features to
           #       support executables compiled using our armhf gcc,

--=-=-=--