From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 19 Dec 2016 17:19:14 +0000 (-0800)
Subject: x264: Fix build on mips architectures
X-Git-Tag: uninative-1.5~998
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=302124c1cc8353f4d0e13ab9ba9057d6b3862bde;p=openembedded-core.git

x264: Fix build on mips architectures

Disable asm to fix

| You specified a pre-MSA CPU in your CFLAGS.
| If you really want to run on such a CPU, configure with --disable-asm.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index e790681ad3..1dafdd53ae 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -24,6 +24,7 @@ X264_DISABLE_ASM = ""
 X264_DISABLE_ASM_armv4 = "--disable-asm"
 X264_DISABLE_ASM_armv5 = "--disable-asm"
 X264_DISABLE_ASM_powerpc = "${@bb.utils.contains("TUNE_FEATURES", "spe", "--disable-asm", "", d)}"
+X264_DISABLE_ASM_mipsarch = "${@bb.utils.contains("TUNE_FEATURES", "r6", "", "--disable-asm", d)}"
 
 EXTRA_OECONF = '--prefix=${prefix} \
                 --host=${HOST_SYS} \