diff options
| author | Mingli Yu <mingli.yu@windriver.com> | 2018-11-12 01:27:42 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-14 11:14:40 +0000 |
| commit | 99956aa33a93e0ce549e09a8fb8bcf2ccaf5b329 (patch) | |
| tree | e7fb7d47523074dc996b87d0e95261b6596ac76f | |
| parent | a5de19553e401f49d63626be102cc99d7d2539d9 (diff) | |
| download | poky-99956aa33a93e0ce549e09a8fb8bcf2ccaf5b329.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]
(From OE-Core rev: 521af79d1d7635b4bd0ee2cc45b96729285bf469)
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.bb | 2 |
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" | |||
| 23 | inherit lib_package pkgconfig perlnative | 23 | inherit lib_package pkgconfig perlnative |
| 24 | 24 | ||
| 25 | X264_DISABLE_ASM = "" | 25 | X264_DISABLE_ASM = "" |
| 26 | X264_DISABLE_ASM_x86_libc-musl = "--disable-asm" | 26 | X264_DISABLE_ASM_x86 = "--disable-asm" |
| 27 | X264_DISABLE_ASM_armv4 = "--disable-asm" | 27 | X264_DISABLE_ASM_armv4 = "--disable-asm" |
| 28 | X264_DISABLE_ASM_armv5 = "--disable-asm" | 28 | X264_DISABLE_ASM_armv5 = "--disable-asm" |
| 29 | X264_DISABLE_ASM_powerpc = "${@bb.utils.contains("TUNE_FEATURES", "spe", "--disable-asm", "", d)}" | 29 | X264_DISABLE_ASM_powerpc = "${@bb.utils.contains("TUNE_FEATURES", "spe", "--disable-asm", "", d)}" |