[PATCH] file depends upon itself!

[PATCH] file depends upon itself!

[John Darrington]

[-- Attachment #1.1: Type: text/plain, Size: 442 bytes --]

The file command is somewhat unusual in that it depends upon a natively compiled
version of itself.

This patch provides that dependency.  Perhaps there is a more elegent way to achieve this.
But I tested this both for native builds and cross builds.o

J'

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #1.2: 0001-gnu-file-Fixed-cross-compilation.patch --]
[-- Type: text/x-diff, Size: 1002 bytes --]

From eb5d135658ad8c3a642699a030d3e545f4d9935d Mon Sep 17 00:00:00 2001
From: John Darrington <jmd@gnu.org>
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 tells
-- 
1.7.10.4


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] file depends upon itself!

[Ludovic Courtès]

John Darrington <john@darrington.wattle.id.au> skribis:

> The file command is somewhat unusual in that it depends upon a natively compiled
> version of itself.

Like Guile.  Initially I added this field for this purpose:

  (self-native-input? #t)

But what you did is better, and is enough to get rid of
‘self-native-input?’.

However, the patch doesn’t apply on ‘master’.  Could you check
what’s going on?

Also, make sure the commit log specifies the changes (like “Add
‘native-inputs’ field”) rather than the rationale (info "(standards)
Change Log Concepts").

Thanks,
Ludo’.

Re: [PATCH] file depends upon itself!

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 967 bytes --]

Try this one.

J'

On Fri, Dec 13, 2013 at 02:01:43PM +0100, Ludovic Court??s wrote:
     John Darrington <john@darrington.wattle.id.au> skribis:
     
     > The file command is somewhat unusual in that it depends upon a natively compiled
     > version of itself.
     
     Like Guile.  Initially I added this field for this purpose:
     
       (self-native-input? #t)
     
     But what you did is better, and is enough to get rid of
     ???self-native-input????.
     
     However, the patch doesn???t apply on ???master???.  Could you check
     what???s going on?
     
     Also, make sure the commit log specifies the changes (like ???Add
     ???native-inputs??? field???) rather than the rationale (info "(standards)
     Change Log Concepts").
     
     Thanks,
     Ludo???.

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: 0001-gnu-file-Fixed-cross-compilation.patch --]
[-- Type: text/x-diff, Size: 960 bytes --]

From 5127a509f71d7308ce622d30c6f0dd55845d9890 Mon Sep 17 00:00:00 2001
From: John Darrington <jmd@gnu.org>
Date: Fri, 13 Dec 2013 10:52:12 +0100
Subject: [PATCH] gnu: file: Fixed cross-compilation.

* gnu/packages/file.scm (file): [(eq? (%current-target-system) #f)] Add native-inputs.
---
 gnu/packages/file.scm |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm
index 1e09fb7..63a9df4 100644
--- a/gnu/packages/file.scm
+++ b/gnu/packages/file.scm
@@ -34,6 +34,9 @@
             (sha256 (base32
                      "08ix4xrvan0k80n0l5lqfmc4azjv5lyhvhwdxny4r09j5smhv78r"))))
    (build-system gnu-build-system)
+   (native-inputs
+    ;; 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 tells
-- 
1.7.10.4

Re: [PATCH] file depends upon itself!

[Ludovic Courtès]

John Darrington <john@darrington.wattle.id.au> skribis:

> From 5127a509f71d7308ce622d30c6f0dd55845d9890 Mon Sep 17 00:00:00 2001
> From: John Darrington <jmd@gnu.org>
> Date: Fri, 13 Dec 2013 10:52:12 +0100
> Subject: [PATCH] gnu: file: Fixed cross-compilation.
>
> * gnu/packages/file.scm (file): [(eq? (%current-target-system) #f)] Add native-inputs.

Pushed, thanks!

Ludo’.