Patrick Williams | 705982a | 2024-01-12 09:51:57 -0600 | [diff] [blame^] | 1 | From cceee20e91af751469872b71155b23f0dec290a7 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Thu, 20 Jun 2019 14:11:16 +0800 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 4 | Subject: [PATCH] Add config option without-valgrind |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 9 | |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 10 | Update patch to version 4.10.5 |
| 11 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
Patrick Williams | 705982a | 2024-01-12 09:51:57 -0600 | [diff] [blame^] | 12 | |
| 13 | Rebase to 4.19.3 |
| 14 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 15 | --- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 16 | lib/replace/wscript | 5 +++-- |
Patrick Williams | 705982a | 2024-01-12 09:51:57 -0600 | [diff] [blame^] | 17 | wscript | 7 +++++++ |
| 18 | 2 files changed, 10 insertions(+), 2 deletions(-) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 19 | |
| 20 | diff --git a/lib/replace/wscript b/lib/replace/wscript |
Patrick Williams | 705982a | 2024-01-12 09:51:57 -0600 | [diff] [blame^] | 21 | index 37d7759..9dd9b48 100644 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 22 | --- a/lib/replace/wscript |
| 23 | +++ b/lib/replace/wscript |
Patrick Williams | 705982a | 2024-01-12 09:51:57 -0600 | [diff] [blame^] | 24 | @@ -113,8 +113,9 @@ def configure(conf): |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 25 | 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 Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 27 | |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 28 | - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') |
Patrick Williams | 705982a | 2024-01-12 09:51:57 -0600 | [diff] [blame^] | 29 | - conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') |
| 30 | + if Options.options.enable_valgrind: |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 31 | + conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h') |
Patrick Williams | 705982a | 2024-01-12 09:51:57 -0600 | [diff] [blame^] | 32 | + conf.CHECK_HEADERS('valgrind/memcheck.h valgrind/helgrind.h valgrind/callgrind.h') |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 33 | 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 Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 35 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 36 | diff --git a/wscript b/wscript |
Patrick Williams | 705982a | 2024-01-12 09:51:57 -0600 | [diff] [blame^] | 37 | index 95ddd9e..6d9577a 100644 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 38 | --- a/wscript |
| 39 | +++ b/wscript |
Patrick Williams | 705982a | 2024-01-12 09:51:57 -0600 | [diff] [blame^] | 40 | @@ -123,6 +123,13 @@ def options(opt): |
| 41 | help=('Disable kernely keyring support for credential storage'), |
| 42 | action='store_false', dest='enable_keyring') |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 43 | |
Patrick Williams | 705982a | 2024-01-12 09:51:57 -0600 | [diff] [blame^] | 44 | + opt.add_option('--with-valgrind', |
| 45 | + help=("Enable use of valgrind"), |
| 46 | + action="store_true", dest='enable_valgrind') |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 47 | + opt.add_option('--without-valgrind', |
Patrick Williams | 705982a | 2024-01-12 09:51:57 -0600 | [diff] [blame^] | 48 | + help=("Disable use of valgrind"), |
| 49 | + action="store_false", dest='enable_valgrind', default=False) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 50 | + |
| 51 | gr = opt.option_group('developer options') |
| 52 | |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 53 | opt.load('python') # options for disabling pyc or pyo compilation |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 54 | -- |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 55 | 2.25.1 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 56 | |