From 3f024ebaf02e82e9282e303a46127f366a84904d Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Thu, 16 Jun 2016 19:22:29 +0300
Subject: [PATCH] [Qt] Install valgrind on-demand

---
 Makefile                         | 2 ++
 configure                        | 1 -
 platform/qt/scripts/configure.sh | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6e682731e..24747f807 100644
--- a/Makefile
+++ b/Makefile
@@ -242,9 +242,11 @@ run-qt-qml-app: qt-qml-app
 
 test-valgrind-qt: $(QT_MAKEFILE) node_modules
 	$(QT_ENV) $(MAKE) -j$(JOBS) -C $(QT_OUTPUT_PATH) test
+	.mason/mason install valgrind latest
 	./scripts/valgrind.sh $(QT_OUTPUT_PATH)/$(BUILDTYPE)/test --gtest_catch_exceptions=0 --gtest_filter=-*.Load
 
 run-valgrind-qt-app: qt-app
+	.mason/mason install valgrind latest
 	./scripts/valgrind.sh $(QT_OUTPUT_PATH)/$(BUILDTYPE)/qmapboxgl --test -platform offscreen
 
 #### Linux targets #####################################################
diff --git a/configure b/configure
index 6b9a3b63c..3c90c5ebb 100755
--- a/configure
+++ b/configure
@@ -127,7 +127,6 @@ print_flags webp static_libs cflags ldflags
 print_flags jni.hpp cflags
 print_flags earcut cflags
 print_flags benchmark static_libs cflags ldflags
-print_flags valgrind
 
 CONFIG+="  }
 }
diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh
index 5f31c853d..4b855f7c5 100644
--- a/platform/qt/scripts/configure.sh
+++ b/platform/qt/scripts/configure.sh
@@ -28,8 +28,6 @@ if [ "$MASON_PLATFORM" == "osx" ]; then
         CONFIG+="    'opengl_ldflags%': ['-framework OpenGL', '-framework CoreFoundation'],"$LN
     }
 else
-    VALGRIND_VERSION=latest
-
     function print_opengl_flags {
         CONFIG+="    'opengl_cflags%': $(quote_flags $(pkg-config gl x11 --cflags)),"$LN
         CONFIG+="    'opengl_ldflags%': $(quote_flags $(pkg-config gl x11 --libs)),"$LN