From 99956aa33a93e0ce549e09a8fb8bcf2ccaf5b329 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Mon, 12 Nov 2018 01:27:42 -0800 Subject: 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] (From OE-Core rev: 521af79d1d7635b4bd0ee2cc45b96729285bf469) Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- meta/recipes-multimedia/x264/x264_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-multimedia') 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)}" -- cgit v1.2.3-54-g00ecf