01/01: gnu: libx264: Fix build on MIPS.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit cb50d0c278e68048d4bd1c30441801ff7e454304
Author: Mark H Weaver <address@hidden>
Date:   Tue Aug 16 00:38:49 2016 -0400

    gnu: libx264: Fix build on MIPS.
    
    * gnu/packages/video.scm (libx264)[arguments]: On MIPS, add
    "--disable-asm" to #:configure-flags.
---
 gnu/packages/video.scm |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 98b7c41..bc6415e 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -222,7 +222,18 @@ television and DVD.  It is also known as AC-3.")
                            ;; package to avoid a circular dependency (the x264
                            ;; program depends on ffmpeg and ffmpeg depends on
                            ;; libx264).
-                           "--disable-cli")))
+                           "--disable-cli"
+
+                           ;; On MIPS, we must pass "--disable-asm" or else
+                           ;; configure fails after printing: "You specified a
+                           ;; pre-MSA CPU in your CFLAGS. If you really want
+                           ;; to run on such a CPU, configure with
+                           ;; --disable-asm."
+                           ,@(if (string-prefix? "mips"
+                                                 (or (%current-target-system)
+                                                     (%current-system)))
+                                 '("--disable-asm")
+                                 '()))))
     (home-page "http://www.videolan.org/developers/x264.html";)
     (synopsis "H.264 video coding library")
     (description "libx264 is an advanced encoding library for creating