aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2019-04-07 09:58:16 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-04-07 10:44:48 +0200
commit5ac8f92c1efa0445fb993b9722f6684f69376adb (patch)
tree15a0c1f95f9f42b3307ce4df42f33fb3a9ec5e2c
parentb7b8a7f3ac2c32d6fde841795ac09b7b9f296219 (diff)
downloadbuildroot-5ac8f92c1efa0445fb993b9722f6684f69376adb.tar.gz
buildroot-5ac8f92c1efa0445fb993b9722f6684f69376adb.tar.bz2
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>
-rw-r--r--package/ffmpeg/ffmpeg.mk5
1 files changed, 5 insertions, 0 deletions
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)