From c3114b756760ddb73054a4bc3d5eff0bfe47c4de Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Wed, 20 Aug 2014 12:13:44 -0400
Subject: gnu: Add 'file' as a native-input on MIPS for some packages.

* gnu/packages/admin.scm (sudo):
  gnu/packages/gawk.scm (gawk): Add 'file' as a native input on MIPS.
  Remove earlier workaround on MIPS.

* gnu/packages/libffi.scm (libffi):
  gnu/packages/bdw-gc.scm (libatomic-ops, libgc): Add 'file' as a
  native input on MIPS.
---
 gnu/packages/gawk.scm | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'gnu/packages/gawk.scm')

diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm
index 6185409fb7..737e610ae5 100644
--- a/gnu/packages/gawk.scm
+++ b/gnu/packages/gawk.scm
@@ -20,6 +20,7 @@
 (define-module (gnu packages gawk)
   #:use-module (guix licenses)
   #:use-module (gnu packages bash)
+  #:use-module (gnu packages file)
   #:use-module (gnu packages libsigsegv)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -55,17 +56,6 @@
                           '((substitute* "extension/Makefile.in"
                               (("^.*: check-for-shared-lib-support" match)
                                (string-append "### " match))))
-                          '())
-
-                    ;; XXX FIXME gawk 4.1.1 was bootstrapped with a prerelease
-                    ;; libtool, which fails on MIPS in the absence of
-                    ;; /usr/bin/file.  As a temporary workaround, we patch
-                    ;; the configure script to hardcode use of the little
-                    ;; endian N32 ABI on MIPS.
-                    ,@(if (equal? "mips64el-linux" (or (%current-target-system)
-                                                       (%current-system)))
-                          '((substitute* "extension/configure"
-                              (("\\$emul") "elf32ltsmipn32")))
                           '())))
                 %standard-phases)))
    (inputs `(("libsigsegv" ,libsigsegv)
@@ -73,7 +63,12 @@
              ,@(if (%current-target-system)
                    `(("bash" ,bash))
                    '())))
-
+   (native-inputs
+    `(;; 'file' is needed by the pre-release libtool on MIPS.
+      ,@(if (equal? "mips64el-linux" (or (%current-target-system)
+                                         (%current-system)))
+            `(("file" ,file))
+            '())))
    (home-page "http://www.gnu.org/software/gawk/")
    (synopsis "A text scanning and processing language")
    (description
-- 
cgit v1.2.3