From 03c20ece58f4368ff95241e90063269f75e1b81d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 13 Oct 2024 12:17:03 -0700 Subject: [PATCH] ffmpeg: Disable asm optimizations on x86 disable asm code if PIC is required, as the provided asm decidedly is not PIC for x86. Signed-off-by: Khem Raj Cc: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 941fc40ca971f87e61c19e5a0703caa304ec7547) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb index af66104ebf3..3c66851b8d2 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 = " \ " EXTRA_OECONF:append:linux-gnux32 = " --disable-asm" +# --enable-pic is used and x86 assembly is not PIC on x86 +EXTRA_OECONF:append:x86 = " --disable-asm" EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', '--disable-mips64r2 --disable-mips32r2', '', d)}" EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r2', '--disable-mips64r6 --disable-mips32r6', '', d)}" -- 2.47.2