From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 7 Apr 2019 07:58:16 +0000 (+0200)
Subject: package/ffmpeg: disable asm on mips r6
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ac8f92c1efa0445fb993b9722f6684f69376adb;p=buildroot.git

package/ffmpeg: disable asm on mips r6

Fixes:
 - http://autobuild.buildroot.org/results/f5125bde6d3604af3342a205a8445947aff95d5a
 - http://autobuild.buildroot.org/results/beb70bd6c1dd9abf7bc1b53299ba0094a36f4179

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 17e4fa7074..eb237d3523 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -482,6 +482,11 @@ FFMPEG_CONF_OPTS += --disable-mipsfpu
 else
 FFMPEG_CONF_OPTS += --enable-mipsfpu
 endif
+
+# Fix build failure on "addi opcode not supported"
+ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y)
+FFMPEG_CONF_OPTS += --disable-asm
+endif
 endif # MIPS
 
 ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)