From 7115d6c6a68ff6386d1577443e9fc7cb49b534b3 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Tue, 8 Dec 2020 16:19:51 +0000
Subject: [PATCH] Do not leak global cargs out of libfwupd

This gives us warnings if a specific binary redefines the domain.
---
 libfwupd/meson.build | 8 ++------
 src/meson.build      | 1 -
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/libfwupd/meson.build b/libfwupd/meson.build
index 469b26d83..976a55262 100644
--- a/libfwupd/meson.build
+++ b/libfwupd/meson.build
@@ -1,7 +1,3 @@
-cargs = [
-  '-DG_LOG_DOMAIN="Fwupd"',
-]
-
 fwupd_version_h = configure_file(
   input : 'fwupd-version.h.in',
   output : 'fwupd-version.h',
@@ -58,7 +54,7 @@ fwupd = shared_library(
   version : libfwupd_lt_version,
   dependencies : libfwupd_deps,
   c_args : [
-      cargs,
+      '-DG_LOG_DOMAIN="Fwupd"',
       '-DLOCALSTATEDIR="' + localstatedir + '"',
     ],
   include_directories : root_incdir,
@@ -183,7 +179,7 @@ if get_option('tests')
     ],
     link_with : fwupd,
     c_args : [
-      cargs,
+      '-DG_LOG_DOMAIN="Fwupd"',
       '-DLOCALSTATEDIR="' + localstatedir + '"',
       '-DTESTDATADIR="' + testdatadir + '"',
       '-DFU_SELF_TEST_REMOTES_DIR="' + testdatadir + '"',
diff --git a/src/meson.build b/src/meson.build
index 68f787bf9..5d7dd535b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -360,7 +360,6 @@ if get_option('tests')
       fwupd,
       fwupdplugin,
     ],
-    c_args : cargs
   )
 endif