daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
ff6046
From c405c3035b595970e65ac9586909618525372c45 Mon Sep 17 00:00:00 2001
ff6046
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
ff6046
Date: Tue, 7 Aug 2018 17:34:47 +0200
ff6046
Subject: [PATCH] meson: add -Dlog-trace to set LOG_TRACE
ff6046
ff6046
The justification is the same as for -Dvalgrind: setting config in
ff6046
meson in this way is easier, because when the value is changed stuff
ff6046
that should be rebuilt is rebuilt.
ff6046
ff6046
(cherry picked from commit fd5dec9adf76591d713f163d43d04e3beb76893e)
ff6046
ff6046
Resolves: #1696224
ff6046
---
ff6046
 meson.build       | 2 ++
ff6046
 meson_options.txt | 2 ++
ff6046
 2 files changed, 4 insertions(+)
ff6046
ff6046
diff --git a/meson.build b/meson.build
ff6046
index 709597e5c4..c1013d525b 100644
ff6046
--- a/meson.build
ff6046
+++ b/meson.build
ff6046
@@ -782,6 +782,7 @@ conf.set10('ENABLE_DEBUG_HASHMAP', enable_debug_hashmap)
ff6046
 conf.set10('ENABLE_DEBUG_MMAP_CACHE', enable_debug_mmap_cache)
ff6046
 
ff6046
 conf.set10('VALGRIND', get_option('valgrind'))
ff6046
+conf.set10('LOG_TRACE', get_option('log-trace'))
ff6046
 
ff6046
 #####################################################################
ff6046
 
ff6046
@@ -2993,6 +2994,7 @@ foreach tuple : [
ff6046
         ['debug hashmap'],
ff6046
         ['debug mmap cache'],
ff6046
         ['valgrind',         conf.get('VALGRIND') == 1],
ff6046
+        ['trace logging',    conf.get('LOG_TRACE') == 1],
ff6046
 ]
ff6046
 
ff6046
         if tuple.length() >= 2
ff6046
diff --git a/meson_options.txt b/meson_options.txt
ff6046
index 5716f45ccf..f06a130582 100644
ff6046
--- a/meson_options.txt
ff6046
+++ b/meson_options.txt
ff6046
@@ -52,6 +52,8 @@ option('memory-accounting-default', type : 'boolean',
ff6046
        description : 'enable MemoryAccounting= by default')
ff6046
 option('valgrind', type : 'boolean', value : false,
ff6046
        description : 'do extra operations to avoid valgrind warnings')
ff6046
+option('log-trace', type : 'boolean', value : false,
ff6046
+       description : 'enable low level debug logging')
ff6046
 
ff6046
 option('utmp', type : 'boolean',
ff6046
        description : 'support for utmp/wtmp log handling')