summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2018-11-12 01:27:42 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-13 23:01:07 +0000
commit521af79d1d7635b4bd0ee2cc45b96729285bf469 (patch)
tree67a70cdc25313d47288e188e0ef5c3dbf0c3be2d
parent3df591cd914a4f060f0a178a59c93b464192d80d (diff)
downloadopenembedded-core-521af79d1d7635b4bd0ee2cc45b96729285bf469.tar.gz
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>
-rw-r--r--meta/recipes-multimedia/x264/x264_git.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index 4174cb2819..842ea2547c 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)}"