diff mbox series

[mickledore,17/19] ffmpeg: avoid neon on unsupported machines

Message ID 866d3ca22ca30bff9d7b85b87387f40b59d60113.1696702947.git.steve@sakoman.com
State New
Headers show
Series [mickledore,01/19] qemu: Fix CVE-2023-3180 | expand

Commit Message

Steve Sakoman Oct. 7, 2023, 10:25 p.m. UTC 
From: Benjamin Bara <benjamin.bara@skidata.com>

Disable neon if the machine does not support it.

Signed-off-by: Benjamin Bara <benjamin.bara@skidata.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0c3a6a74531d3860a3849a1f53f6709d6a0e88a5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.3.bb | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series

Patch

diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.3.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.3.bb
index 9899e570ad..cecaeded8c 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.3.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_5.1.3.bb
@@ -136,6 +136,8 @@  EXTRA_OECONF:append:mips = " --extra-libs=-latomic --disable-mips32r5 --disable-
 EXTRA_OECONF:append:riscv32 = " --extra-libs=-latomic"
 EXTRA_OECONF:append:armv5 = " --extra-libs=-latomic"
 EXTRA_OECONF:append:powerpc = " --extra-libs=-latomic"
+EXTRA_OECONF:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}"
+EXTRA_OECONF:append:armv7ve = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}"
 
 # gold crashes on x86, another solution is to --disable-asm but thats more hacky
 # ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684