blob: 46a6f06267eabe77f00d92a45bbba55f3646596d [file] [log] [blame]
Brad Bishop26bdd442019-08-16 17:08:17 -04001From 87bc8e7eafc7d12a1d3a143ebb9e43cf5fbafb72 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 20 Jun 2019 14:11:16 +0800
Patrick Williamsb48b7b42016-08-17 15:04:38 -05004Subject: [PATCH] Add config option without-valgrind
5
6Upstream-Status: Pending
7
8Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Brad Bishop316dfdd2018-06-25 12:45:53 -04009
Brad Bishop26bdd442019-08-16 17:08:17 -040010Update patch to version 4.10.5
11Signed-off-by: Changqing Li <changqing.li@windriver.com>
Patrick Williamsb48b7b42016-08-17 15:04:38 -050012---
Brad Bishop26bdd442019-08-16 17:08:17 -040013 lib/replace/wscript | 5 +++--
Patrick Williamsb48b7b42016-08-17 15:04:38 -050014 wscript | 4 ++++
Brad Bishop26bdd442019-08-16 17:08:17 -040015 2 files changed, 7 insertions(+), 2 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050016
17diff --git a/lib/replace/wscript b/lib/replace/wscript
Brad Bishop26bdd442019-08-16 17:08:17 -040018index a7fd25d..a19ae68 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050019--- a/lib/replace/wscript
20+++ b/lib/replace/wscript
Brad Bishop26bdd442019-08-16 17:08:17 -040021@@ -110,8 +110,9 @@ def configure(conf):
Brad Bishop316dfdd2018-06-25 12:45:53 -040022 conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
23 conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050024
Brad Bishop26bdd442019-08-16 17:08:17 -040025- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
26- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050027+ if not Options.options.disable_valgrind:
Brad Bishop26bdd442019-08-16 17:08:17 -040028+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
29+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050030 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
31 conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
Brad Bishop316dfdd2018-06-25 12:45:53 -040032 conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050033diff --git a/wscript b/wscript
Brad Bishop26bdd442019-08-16 17:08:17 -040034index e38a8e9..38b7230 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050035--- a/wscript
36+++ b/wscript
Brad Bishop26bdd442019-08-16 17:08:17 -040037@@ -105,6 +105,10 @@ def options(opt):
Brad Bishop316dfdd2018-06-25 12:45:53 -040038 help=("Disable RELRO builds"),
39 action="store_false", dest='enable_relro')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050040
41+ opt.add_option('--without-valgrind',
42+ help=("Disable use of the valgrind headers"),
43+ action="store_true", dest='disable_valgrind', default=False)
44+
45 gr = opt.option_group('developer options')
46
Brad Bishop26bdd442019-08-16 17:08:17 -040047 opt.load('python') # options for disabling pyc or pyo compilation
Patrick Williamsb48b7b42016-08-17 15:04:38 -050048--
Brad Bishop26bdd442019-08-16 17:08:17 -0400492.7.4
Patrick Williamsb48b7b42016-08-17 15:04:38 -050050