proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-07-27 10:47:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not leak global cargs out of libfwupd

Browse Source 
This gives us warnings if a specific binary redefines the domain.
This commit is contained in:
Richard Hughes 2020-12-08 16:19:51 +00:00
parent 386f2c1d39
commit 7115d6c6a6
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libfwupd/meson.build
View File

@ -1,7 +1,3 @@
cargs = [
'-DG_LOG_DOMAIN="Fwupd"',
]
fwupd_version_h = configure_file( fwupd_version_h = configure_file(
input : 'fwupd-version.h.in', input : 'fwupd-version.h.in',
output : 'fwupd-version.h', output : 'fwupd-version.h',
@ -58,7 +54,7 @@ fwupd = shared_library(
version : libfwupd_lt_version, version : libfwupd_lt_version,
dependencies : libfwupd_deps, dependencies : libfwupd_deps,
c_args : [ c_args : [
cargs, '-DG_LOG_DOMAIN="Fwupd"',
'-DLOCALSTATEDIR="' + localstatedir + '"', '-DLOCALSTATEDIR="' + localstatedir + '"',
], ],
include_directories : root_incdir, include_directories : root_incdir,
@ -183,7 +179,7 @@ if get_option('tests')
], ],
link_with : fwupd, link_with : fwupd,
c_args : [ c_args : [
cargs, '-DG_LOG_DOMAIN="Fwupd"',
'-DLOCALSTATEDIR="' + localstatedir + '"', '-DLOCALSTATEDIR="' + localstatedir + '"',
'-DTESTDATADIR="' + testdatadir + '"', '-DTESTDATADIR="' + testdatadir + '"',
'-DFU_SELF_TEST_REMOTES_DIR="' + testdatadir + '"', '-DFU_SELF_TEST_REMOTES_DIR="' + testdatadir + '"',

1
src/meson.build
View File

@ -360,7 +360,6 @@ if get_option('tests')
fwupd, fwupd,
fwupdplugin, fwupdplugin,
], ],
c_args : cargs
) )
endif endif