From: Jose Maria Casanova Crespo Date: Tue, 5 May 2020 19:50:33 +0000 (+0200) Subject: meson: require valgrind 3.10.0 to enable it with freedreno X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c997baf590de48ac5fc52a6e2df806e0a6f3acfc;hp=bfa782c5f6eb0158c13938d8dc7c3fd87831371e;p=android-x86%2Fexternal-libdrm.git meson: require valgrind 3.10.0 to enable it with freedreno Freedreno uses VALGRIND_ENABLE_ADDR_ERROR_REPORTING_IN_RANGE that was introduced in Valgrind 3.10.0 Raspbian Buster includes Valgrind 3.7.0, so when valgrind is installed as freedreno is build by default the build becomes broken. So lets require 3.10 to enable valgrind when freedreno is built. v2: Keep the arguments listed in the same order (Emil Velikov) Closes: https://gitlab.freedesktop.org/mesa/drm/-/issues/37 Signed-off-by: Jose Maria Casanova Crespo Reviewed-by: Emil Velikov --- diff --git a/meson.build b/meson.build index 461fefe5..a7c5476c 100644 --- a/meson.build +++ b/meson.build @@ -249,7 +249,11 @@ else endif _valgrind = get_option('valgrind') if _valgrind != 'false' - dep_valgrind = dependency('valgrind', required : _valgrind == 'true') + if with_freedreno + dep_valgrind = dependency('valgrind', required : _valgrind == 'true', version : '>=3.10.0') + else + dep_valgrind = dependency('valgrind', required : _valgrind == 'true') + endif with_valgrind = dep_valgrind.found() else dep_valgrind = []