Browse Source

Prep v239: Unmask Valgrind options and checks in meson files.

Doesn't hurt to leave that possibility open.
upstream/latest
Sven Eden 3 years ago
parent
commit
47215898da
  1. 17
      meson.build
  2. 9
      meson_options.txt

17
meson.build

@ -684,10 +684,8 @@ foreach header : ['crypt.h',
'linux/memfd.h',
'linux/vm_sockets.h',
'sys/auxv.h',
#if 0 /// UNNEEDED by elogind
# 'valgrind/memcheck.h',
# 'valgrind/valgrind.h',
#endif // 0
'valgrind/memcheck.h',
'valgrind/valgrind.h',
]
conf.set10('HAVE_' + header.underscorify().to_upper(),
@ -909,9 +907,7 @@ conf.set10('ENABLE_DEBUG_MMAP_CACHE', enable_debug_mmap_cache)
conf.set10('ENABLE_DEBUG_ELOGIND', enable_debug_elogind)
#endif // 1
#if 0 /// UNNEEDED by elogind
# conf.set10('VALGRIND', get_option('valgrind'))
#endif // 0
conf.set10('VALGRIND', get_option('valgrind'))
#####################################################################
@ -3351,10 +3347,11 @@ foreach tuple : [
# ['adm group', get_option('adm-group')],
# ['wheel group', get_option('wheel-group')],
# ['gshadow'],
# ['valgrind', conf.get('VALGRIND') == 1],
#else
['debug elogind'],
#endif // 0
['valgrind', conf.get('VALGRIND') == 1],
#if 1 /// Extra debugging for elogind
['debug elogind'],
#endif // 1
['debug hashmap'],
['debug mmap cache'],
]

9
meson_options.txt

@ -76,12 +76,13 @@ option('kexec-path', type : 'string', description : 'path to kexec')
# description : 'enable extra debugging')
# option('memory-accounting-default', type : 'boolean',
# description : 'enable MemoryAccounting= by default')
# option('valgrind', type : 'boolean', value : false,
# description : 'do extra operations to avoid valgrind warnings')
#else
#endif // 0
option('valgrind', type : 'boolean', value : false,
description : 'do extra operations to avoid valgrind warnings')
#if 1 /// Add an extra debugging option for elogind
option('debug', type : 'array', choices : ['elogind', 'hashmap', 'mmap-cache'], value : [],
description : 'enable extra debugging')
#endif // 0
#endif // 1
option('utmp', type : 'boolean',
description : 'support for utmp/wtmp log handling')

Loading…
Cancel
Save