summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Maria Casanova Crespo <jmcasanova@igalia.com>2020-05-05 21:50:33 +0200
committerJosé Casanova Crespo <jmcasanova@igalia.com>2020-05-07 02:57:55 +0000
commitc997baf590de48ac5fc52a6e2df806e0a6f3acfc (patch)
tree4b601662755e67d12f41193a0b1d3b896fc5e2c0
parentbfa782c5f6eb0158c13938d8dc7c3fd87831371e (diff)
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 <jmcasanova@igalia.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
-rw-r--r--meson.build6
1 files changed, 5 insertions, 1 deletions
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 = []