From: Mingli Yu <mingli.yu@windriver.com>
Date: Mon, 12 Nov 2018 09:27:42 +0000 (-0800)
Subject: x264: Disable asm on x86
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~16178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=521af79d1d7635b4bd0ee2cc45b96729285bf469;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

x264: Disable asm on x86

The previous commit as below only fixes the
textrel issue with musl on x86, update it also to
fix the issue such as with glibc on x86.
74ea4f280c1 x264: Disable asm on musl/x86

[YOCTO #11770]

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index 4174cb28196..842ea2547c3 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -23,7 +23,7 @@ S = "${WORKDIR}/git"
 inherit lib_package pkgconfig perlnative
 
 X264_DISABLE_ASM = ""
-X264_DISABLE_ASM_x86_libc-musl = "--disable-asm"
+X264_DISABLE_ASM_x86 = "--disable-asm"
 X264_DISABLE_ASM_armv4 = "--disable-asm"
 X264_DISABLE_ASM_armv5 = "--disable-asm"
 X264_DISABLE_ASM_powerpc = "${@bb.utils.contains("TUNE_FEATURES", "spe", "--disable-asm", "", d)}"