From cceee20e91af751469872b71155b23f0dec290a7 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 20 Jun 2019 14:11:16 +0800
Subject: [PATCH] Add config option without-valgrind

Upstream-Status: Pending

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>

Update patch to version 4.10.5
Signed-off-by: Changqing Li <changqing.li@windriver.com>

Rebase to 4.19.3
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 lib/replace/wscript | 5 +++--
 wscript             | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 37d7759..9dd9b48 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -113,8 +113,9 @@ def configure(conf):
     conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
     conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
 
-    conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
-    conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h')
+    if Options.options.enable_valgrind:
+        conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
+        conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h')
     conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
     conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
     conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h')
diff --git a/wscript b/wscript
index 95ddd9e..6d9577a 100644
--- a/wscript
+++ b/wscript
@@ -123,6 +123,13 @@ def options(opt):
                   help=('Disable kernely keyring support for credential storage'),
                   action='store_false', dest='enable_keyring')
 
+    opt.add_option('--with-valgrind',
+                   help=("Enable use of valgrind"),
+                   action="store_true", dest='enable_valgrind')
+    opt.add_option('--without-valgrind',
+                   help=("Disable use of valgrind"),
+                   action="store_false", dest='enable_valgrind', default=False)
+
     gr = opt.option_group('developer options')
 
     opt.load('python') # options for disabling pyc or pyo compilation
-- 
2.25.1

