From: Kai Kang Date: Fri, 30 Sep 2022 08:34:33 +0000 (+0800) Subject: mesa: only apply patch to fix ALWAYS_INLINE for native X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~2820 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6a6d0c2680799683d58968c2558a224f27caaa2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Kai Kang Signed-off-by: Alexandre Belloni --- diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 8a74e0a80a5..c94e4393631 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 \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ file://0001-util-format-Check-for-NEON-before-using-it.patch \ - file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \ " +# required by mesa-native on Ubuntu 18.04 with gcc 7.5 when DEBUG_BUILD enabled +SRC_URI:append:class-native = " file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch" + SRC_URI[sha256sum] = "b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)"