]> code.ossystems Code Review - openembedded-core.git/commitdiff
x264: Disable asm on x86
authorMingli Yu <mingli.yu@windriver.com>
Mon, 12 Nov 2018 09:27:42 +0000 (01:27 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 13 Nov 2018 23:01:07 +0000 (23:01 +0000)
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>
meta/recipes-multimedia/x264/x264_git.bb

index 4174cb28196f670c7ebeb6cb55e4d174ae4aef3b..842ea2547c3de4c1973c53b685603741ef055398 100644 (file)
@@ -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)}"