summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2022-09-30 16:34:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-04 23:31:48 +0000
commit570e56775b3ef998acabe38a6233f03ec0ab5b53 (patch)
tree10e30ad979519f6ae8991e08425638672e0119b9 /meta
parent0dfef83aa5418d2238bb0f5112204b7a7555230f (diff)
downloadpoky-570e56775b3ef998acabe38a6233f03ec0ab5b53.tar.gz
mesa: only apply patch to fix ALWAYS_INLINE for native
0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch is not needed by target mesa any more. But it still fails to compile mesa-native without this patch when DEBUG_BUILD is enabled on Ubuntu 18.04 with gcc 7.5.0: | ../mesa-22.1.6/src/compiler/nir/nir_inline_helpers.h: In function ‘nir_opt_move_block’: | ../mesa-22.1.6/src/compiler/nir/nir_opt_move.c:55:1: error: inlining failed in call to always_inline ‘src_is_ssa’: indirect function call with a yet undetermined callee | src_is_ssa(nir_src *src, void *state) | ^~~~~~~~~~ So only apply it for mesa-native. (From OE-Core rev: f6fb2da56ef1f35b536ebf62a03e10bba59d8276) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit c6a6d0c2680799683d58968c2558a224f27caaa2) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 8a74e0a80a..c94e439363 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -19,9 +19,11 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
19 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ 19 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
20 file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ 20 file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
21 file://0001-util-format-Check-for-NEON-before-using-it.patch \ 21 file://0001-util-format-Check-for-NEON-before-using-it.patch \
22 file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \
23 " 22 "
24 23
24# required by mesa-native on Ubuntu 18.04 with gcc 7.5 when DEBUG_BUILD enabled
25SRC_URI:append:class-native = " file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch"
26
25SRC_URI[sha256sum] = "b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c" 27SRC_URI[sha256sum] = "b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c"
26 28
27UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" 29UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"