[PATCH] distro: Add file.

[PATCH] distro: Add file.

[Andreas Enge]

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

Patch for "file" attached. Strangely, it uses "file" in its configure 
script, but this does not seem to be crucial:

    case `/usr/bin/file conftest.o` in
      *32-bit*)
        case $host in
          x86_64-*kfreebsd*-gnu)
            LD="${LD-ld} -m elf_i386_fbsd"
            ;;
          x86_64-*linux*)
            LD="${LD-ld} -m elf_i386"
            ;;
          ppc64-*linux*|powerpc64-*linux*)
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
            LD="${LD-ld} -m elf_s390"
            ;;
          sparc64-*linux*)
            LD="${LD-ld} -m elf32_sparc"
            ;;
        esac
        ;;
      *64-bit*)
        case $host in
          x86_64-*kfreebsd*-gnu)

etc.

Andreas

[-- Attachment #1.2: Type: text/html, Size: 5421 bytes --]

[-- Attachment #2: 0001-distro-Add-file.patch --]
[-- Type: text/x-patch, Size: 3088 bytes --]

From 5ec3cc8062a4079d80c2231c9c91e04cbca8e26c Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Thu, 17 Jan 2013 22:09:15 +0100
Subject: [PATCH] distro: Add file.

* distro/packages/file.scm: New file.
* Makefile.am (MODULES): Add it.
---
 Makefile.am              |    2 ++
 distro/packages/file.scm |   44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 distro/packages/file.scm

diff --git a/Makefile.am b/Makefile.am
index beba7df..3efe369 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 # GNU Guix --- Functional package management for GNU
 # Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2013 Andreas Enge <andreas@enge.fr>
 #
 # This file is part of GNU Guix.
 #
@@ -63,6 +64,7 @@ MODULES =					\
   distro/packages/ddrescue.scm			\
   distro/packages/ed.scm			\
   distro/packages/emacs.scm			\
+  distro/packages/file.scm			\
   distro/packages/flex.scm			\
   distro/packages/gawk.scm			\
   distro/packages/gdb.scm			\
diff --git a/distro/packages/file.scm b/distro/packages/file.scm
new file mode 100644
index 0000000..61bdd71
--- /dev/null
+++ b/distro/packages/file.scm
@@ -0,0 +1,44 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (distro packages file)
+  #:use-module (distro)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public file
+  (package
+   (name "file")
+   (version "5.12")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "ftp://ftp.astron.com/pub/file/file-"
+                   version ".tar.gz"))
+            (sha256 (base32
+                     "08ix4xrvan0k80n0l5lqfmc4azjv5lyhvhwdxny4r09j5smhv78r"))))
+   (build-system gnu-build-system)
+   (synopsis "file, a file type guesser")
+   (description
+    "The file command is a file type guesser, a command-line tool that tells
+you in words what kind of data a file contains. It does not rely on filename
+extentions to tell you the type of a file, but looks at the actual contents
+of the file.")
+   (license bsd-2)
+   (home-page "http://www.darwinsys.com/file/")))
-- 
1.7.10.4

Re: [PATCH] distro: Add file.

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> Patch for "file" attached. Strangely, it uses "file" in its configure 
> script, but this does not seem to be crucial:
>
>     case `/usr/bin/file conftest.o` in

I think this bit is automatically added by Autoconf everywhere.  Nothing
to worry about, it seems.

> From 5ec3cc8062a4079d80c2231c9c91e04cbca8e26c Mon Sep 17 00:00:00 2001
> From: Andreas Enge <andreas@enge.fr>
> Date: Thu, 17 Jan 2013 22:09:15 +0100
> Subject: [PATCH] distro: Add file.
>
> * distro/packages/file.scm: New file.
> * Makefile.am (MODULES): Add it.

Fine with me!

Thanks,
Ludo’.

Re: [PATCH] distro: Add file.

[Andreas Enge]

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

Am Donnerstag, 17. Januar 2013 schrieb Ludovic Courtès:
> Andreas Enge <andreas@enge.fr> skribis:
> > Patch for "file" attached. Strangely, it uses "file" in its configure
> > script, but this does not seem to be crucial:
> >     case `/usr/bin/file conftest.o` in
> I think this bit is automatically added by Autoconf everywhere.  Nothing
> to worry about, it seems.

I added it as an input to libtiff. I suppose this is the right thing to do, 
or should I drop it there as well?

Andreas

[-- Attachment #2: Type: text/html, Size: 2621 bytes --]

Re: [PATCH] distro: Add file.

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> Am Donnerstag, 17. Januar 2013 schrieb Ludovic Courtès:
>> Andreas Enge <andreas@enge.fr> skribis:
>> > Patch for "file" attached. Strangely, it uses "file" in its configure
>> > script, but this does not seem to be crucial:
>> >     case `/usr/bin/file conftest.o` in
>> I think this bit is automatically added by Autoconf everywhere.  Nothing
>> to worry about, it seems.
>
> I added it as an input to libtiff. I suppose this is the right thing to do, 
> or should I drop it there as well?

Well, since /usr/bin/file is hard-coded, adding ‘file’ as an input would
not be enough: you’d also need to patch ‘configure’.

However, this /usr/bin/file stanza in ‘configure’ scripts doesn’t seem
to have any practical impact since we’ve been building without it for
ages.  So I would just keep ignoring it.  :-)

Ludo’.

Re: [PATCH] distro: Add file.

[Andreas Enge]

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

Am Freitag, 18. Januar 2013 schrieb Ludovic Courtès:
> Well, since /usr/bin/file is hard-coded, adding ‘file’ as an input would
> not be enough: you’d also need to patch ‘configure’.

Yes, this is what I did indeed.

> However, this /usr/bin/file stanza in ‘configure’ scripts doesn’t seem
> to have any practical impact since we’ve been building without it for
> ages.  So I would just keep ignoring it.  :-)

Okay, next time!

Andreas

[-- Attachment #2: Type: text/html, Size: 2861 bytes --]