02/02: gnu: x265: Disable assembly optimizations on i686-linux.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit d32a3b395c4b9926316779aecec4e5e02ad571ef
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Jun 9 20:27:09 2020 +0200

    gnu: x265: Disable assembly optimizations on i686-linux.
    
    Fixes <https://bugs.gnu.org/41768>.
    
    * gnu/packages/video.scm (x265)[native-inputs]: Conditionally add NASM.
---
 gnu/packages/video.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c822075..18244c3 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -625,7 +625,11 @@ available.")
                     (delete-file-recursively "source/compat/getopt")
                     #t))))
     (build-system cmake-build-system)
-    (native-inputs `(("nasm" ,nasm)))
+    (native-inputs
+     ;; XXX: ASM optimization fails on i686-linux, see 
<https://bugs.gnu.org/41768>.
+     (if (string-prefix? "i686" (%current-system))
+         '()
+         `(("nasm" ,nasm))))
     (arguments
      `(#:tests? #f ; tests are skipped if cpu-optimized code isn't built
        #:configure-flags