From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: [PATCH] file depends upon itself! Date: Fri, 13 Dec 2013 11:01:17 +0100 Message-ID: <20131213100117.GA31522@jocasta.intra> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="CdrF4e02JqNVZeln" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrPYk-0003Gm-Ep for guix-devel@gnu.org; Fri, 13 Dec 2013 05:01:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VrPYf-0006h8-CK for guix-devel@gnu.org; Fri, 13 Dec 2013 05:01:26 -0500 Received: from de.cellform.com ([88.217.224.109]:58104 helo=jocasta.intra) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrPYe-0006gq-Vy for guix-devel@gnu.org; Fri, 13 Dec 2013 05:01:21 -0500 Received: from jocasta.intra (localhost [127.0.0.1]) by jocasta.intra (8.14.4/8.14.4/Debian-4) with ESMTP id rBDA1ICa031759 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Dec 2013 11:01:18 +0100 Received: (from john@localhost) by jocasta.intra (8.14.4/8.14.4/Submit) id rBDA1HtL031758 for guix-devel@gnu.org; Fri, 13 Dec 2013 11:01:17 +0100 Content-Disposition: inline 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: guix-devel@gnu.org --CdrF4e02JqNVZeln Content-Type: multipart/mixed; boundary="M9NhX3UHpAaciwkO" Content-Disposition: inline --M9NhX3UHpAaciwkO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The file command is somewhat unusual in that it depends upon a natively com= piled version of itself. This patch provides that dependency. Perhaps there is a more elegent way t= o achieve this. But I tested this both for native builds and cross builds.o J' --=20 PGP Public key ID: 1024D/2DE827B3=20 fingerprint =3D 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3 See http://sks-keyservers.net or any PGP keyserver for public key. --M9NhX3UHpAaciwkO Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-file-Fixed-cross-compilation.patch" Content-Transfer-Encoding: quoted-printable =46rom eb5d135658ad8c3a642699a030d3e545f4d9935d Mon Sep 17 00:00:00 2001 =46rom: John Darrington Date: Fri, 13 Dec 2013 10:52:12 +0100 Subject: [PATCH] gnu: file: Fixed cross-compilation. * gnu/packages/file.scm (file): The file package depends upon a native build of itself. --- gnu/packages/file.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index 5583c20..63a9df4 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -35,7 +35,8 @@ "08ix4xrvan0k80n0l5lqfmc4azjv5lyhvhwdxny4r09j5smhv78r= ")))) (build-system gnu-build-system) (native-inputs - `(("file" ,file))) + ;; This package depends upon a native install of itself. + (if (%current-target-system) `(("file" ,file)) '() )) (synopsis "file, a file type guesser") (description "The file command is a file type guesser, a command-line tool that tel= ls --=20 1.7.10.4 --M9NhX3UHpAaciwkO-- --CdrF4e02JqNVZeln Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlKq2u0ACgkQimdxnC3oJ7MnHwCfdO/TPopHhKLNmpNaQV5xLcOW IoUAnRi+sg7gHKwSJ47cAF0Ffcv79bAw =k+EE -----END PGP SIGNATURE----- --CdrF4e02JqNVZeln--