blob: 2c9d29c9fe7aa87082798759f83a01588da3ea9a [file] [log] [blame]
Patrick Williams705982a2024-01-12 09:51:57 -06001From cceee20e91af751469872b71155b23f0dec290a7 Mon Sep 17 00:00:00 2001
Brad Bishop26bdd442019-08-16 17:08:17 -04002From: 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 Williams705982a2024-01-12 09:51:57 -060012
13Rebase to 4.19.3
14Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Patrick Williamsb48b7b42016-08-17 15:04:38 -050015---
Brad Bishop26bdd442019-08-16 17:08:17 -040016 lib/replace/wscript | 5 +++--
Patrick Williams705982a2024-01-12 09:51:57 -060017 wscript | 7 +++++++
18 2 files changed, 10 insertions(+), 2 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050019
20diff --git a/lib/replace/wscript b/lib/replace/wscript
Patrick Williams705982a2024-01-12 09:51:57 -060021index 37d7759..9dd9b48 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050022--- a/lib/replace/wscript
23+++ b/lib/replace/wscript
Patrick Williams705982a2024-01-12 09:51:57 -060024@@ -113,8 +113,9 @@ def configure(conf):
Brad Bishop316dfdd2018-06-25 12:45:53 -040025 conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
26 conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050027
Brad Bishop26bdd442019-08-16 17:08:17 -040028- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
Patrick Williams705982a2024-01-12 09:51:57 -060029- conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h')
30+ if Options.options.enable_valgrind:
Brad Bishop26bdd442019-08-16 17:08:17 -040031+ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h')
Patrick Williams705982a2024-01-12 09:51:57 -060032+ conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050033 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
34 conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
Brad Bishop316dfdd2018-06-25 12:45:53 -040035 conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050036diff --git a/wscript b/wscript
Patrick Williams705982a2024-01-12 09:51:57 -060037index 95ddd9e..6d9577a 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050038--- a/wscript
39+++ b/wscript
Patrick Williams705982a2024-01-12 09:51:57 -060040@@ -123,6 +123,13 @@ def options(opt):
41 help=('Disable kernely keyring support for credential storage'),
42 action='store_false', dest='enable_keyring')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050043
Patrick Williams705982a2024-01-12 09:51:57 -060044+ opt.add_option('--with-valgrind',
45+ help=("Enable use of valgrind"),
46+ action="store_true", dest='enable_valgrind')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050047+ opt.add_option('--without-valgrind',
Patrick Williams705982a2024-01-12 09:51:57 -060048+ help=("Disable use of valgrind"),
49+ action="store_false", dest='enable_valgrind', default=False)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050050+
51 gr = opt.option_group('developer options')
52
Brad Bishop26bdd442019-08-16 17:08:17 -040053 opt.load('python') # options for disabling pyc or pyo compilation
Patrick Williamsb48b7b42016-08-17 15:04:38 -050054--
Andrew Geissler517393d2023-01-13 08:55:19 -0600552.25.1
Patrick Williamsb48b7b42016-08-17 15:04:38 -050056