diff --git a/meson.build b/meson.build index e9c44bbb94..0f44814db4 100644 --- a/meson.build +++ b/meson.build @@ -793,7 +793,6 @@ substs.set('DEBUGTTY', get_option('debug-tty')) enable_debug_hashmap = false enable_debug_mmap_cache = false enable_debug_siphash = false -enable_debug_udev = false foreach name : get_option('debug-extra') if name == 'hashmap' enable_debug_hashmap = true @@ -801,8 +800,6 @@ foreach name : get_option('debug-extra') enable_debug_mmap_cache = true elif name == 'siphash' enable_debug_siphash = true - elif name == 'udev' - enable_debug_udev = true else message('unknown debug option "@0@", ignoring'.format(name)) endif @@ -810,7 +807,6 @@ endforeach conf.set10('ENABLE_DEBUG_HASHMAP', enable_debug_hashmap) conf.set10('ENABLE_DEBUG_MMAP_CACHE', enable_debug_mmap_cache) conf.set10('ENABLE_DEBUG_SIPHASH', enable_debug_siphash) -conf.set10('ENABLE_DEBUG_UDEV', enable_debug_udev) conf.set10('VALGRIND', get_option('valgrind')) conf.set10('LOG_TRACE', get_option('log-trace')) @@ -3199,7 +3195,6 @@ foreach tuple : [ ['debug hashmap'], ['debug mmap cache'], ['debug siphash'], - ['debug udev'], ['valgrind', conf.get('VALGRIND') == 1], ['trace logging', conf.get('LOG_TRACE') == 1], ['link-udev-shared', get_option('link-udev-shared')], diff --git a/meson_options.txt b/meson_options.txt index b96e49d825..e56d33760b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -46,7 +46,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', description : 'path to debug shell binary') option('debug-tty', type : 'string', value : '/dev/tty9', description : 'specify the tty device for debug shell') -option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache', 'siphash', 'udev'], value : [], +option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache', 'siphash'], value : [], description : 'enable extra debugging') option('memory-accounting-default', type : 'boolean', description : 'enable MemoryAccounting= by default')