summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-06-09 20:27:09 +0200
committerMarius Bakke <marius@gnu.org>2020-06-09 20:43:36 +0200
commitd32a3b395c4b9926316779aecec4e5e02ad571ef (patch)
tree6c6e5e7578f30f6cbd0d9f40361e22e2263292de
parent2e08394b3c64ad77cebb94f54677130e4fdaf9e9 (diff)
downloadguix-d32a3b395c4b9926316779aecec4e5e02ad571ef.tar.gz
gnu: x265: Disable assembly optimizations on i686-linux.
Fixes <https://bugs.gnu.org/41768>.

* gnu/packages/video.scm (x265)[native-inputs]: Conditionally add NASM.
-rw-r--r--gnu/packages/video.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c822075c57..18244c368a 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