summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2024-10-13 12:17:03 -0700
committerSteve Sakoman <steve@sakoman.com>2024-11-11 09:16:26 -0800
commit84bb73b74a63bc27c99a8b9bb9bd689835d4d794 (patch)
tree4a09b7e37c27e2bbe7aefc7af9f661e9e00f6158
parent2f866930d9d6da0c66ed8808ea33d201e4834b7d (diff)
downloadpoky-84bb73b74a63bc27c99a8b9bb9bd689835d4d794.tar.gz
ffmpeg: Disable asm optimizations on x86
disable asm code if PIC is required, as the provided asm decidedly is not PIC for x86. (From OE-Core rev: 03c20ece58f4368ff95241e90063269f75e1b81d) Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 941fc40ca971f87e61c19e5a0703caa304ec7547) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb
index af66104ebf..3c66851b8d 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb
@@ -129,6 +129,8 @@ EXTRA_OECONF = " \
129" 129"
130 130
131EXTRA_OECONF:append:linux-gnux32 = " --disable-asm" 131EXTRA_OECONF:append:linux-gnux32 = " --disable-asm"
132# --enable-pic is used and x86 assembly is not PIC on x86
133EXTRA_OECONF:append:x86 = " --disable-asm"
132 134
133EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', '--disable-mips64r2 --disable-mips32r2', '', d)}" 135EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', '--disable-mips64r2 --disable-mips32r2', '', d)}"
134EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r2', '--disable-mips64r6 --disable-mips32r6', '', d)}" 136EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r2', '--disable-mips64r6 --disable-mips32r6', '', d)}"