fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-07 03:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'meson-check-fix'

Browse source 
build: specify run_command semantics

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1869
This commit is contained in:
Íñigo Huguet 2024-03-01 07:48:26 +00:00
commit 4c76d49f1f
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -254,7 +254,7 @@ config_h.set10('WITH_JANSSON', jansson_dep.found())
jansson_msg = 'no'
if jansson_dep.found()
jansson_libdir = jansson_dep.get_pkgconfig_variable('libdir')
res = run_command(find_program('eu-readelf', 'readelf'), '-d', join_paths(jansson_libdir, 'libjansson.so'))
res = run_command(find_program('eu-readelf', 'readelf'), '-d', join_paths(jansson_libdir, 'libjansson.so'), check: false)
jansson_soname = ''
foreach line: res.stdout().split('\n')
if line.strip().contains('SONAME')
@ -296,7 +296,7 @@ config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH', config_migrate_if
enable_ifupdown = get_option('ifupdown')
if enable_ifupdown == 'auto'
enable_ifupdown = (run_command('test', '-e', '/etc/debian_version').returncode() == 0)
enable_ifupdown = (run_command('test', '-e', '/etc/debian_version', check: false).returncode() == 0)
else
enable_ifupdown = (enable_ifupdown != 'false')
endif
@ -514,7 +514,7 @@ polkit_agent_helper_1_path = get_option('polkit_agent_helper_1')
foreach p : [ '/usr/libexec/polkit-agent-helper-1',
'/usr/lib/polkit-1/polkit-agent-helper-1',
'/usr/lib/policykit-1/polkit-agent-helper-1' ]
if polkit_agent_helper_1_path == '' and run_command('test', '-f', p).returncode() == 0
if polkit_agent_helper_1_path == '' and run_command('test', '-f', p, check: false).returncode() == 0
polkit_agent_helper_1_path = p
endif
endforeach

4
src/libnm-client-impl/meson.build
View file

@ -166,13 +166,13 @@ if enable_introspection
install: true,
)
gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH', check: false).stdout()
if gi_typelib_path != ''
gi_typelib_path = ':' + gi_typelib_path
endif
gi_typelib_path = meson.current_build_dir() + gi_typelib_path
ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH').stdout()
ld_library_path = run_command('printenv', 'LD_LIBRARY_PATH', check: false).stdout()
if ld_library_path != ''
ld_library_path = ':' + ld_library_path
endif