From e6fe2a6a222c21f31dc1572a32f99db4c1e069bd Mon Sep 17 00:00:00 2001 From: dmitry Date: Sat, 10 Sep 2022 04:01:31 +0300 Subject: [PATCH] crlib: update to latest revision (fix gcc warnings) meson: suppress run_command warnings --- ext/crlib | 2 +- meson.build | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/crlib b/ext/crlib index 9375af6..d20fe64 160000 --- a/ext/crlib +++ b/ext/crlib @@ -1 +1 @@ -Subproject commit 9375af6e408b5fcd195c2bce5f2565bc3fbd3160 +Subproject commit d20fe64b8a1a63b17875fdeb8fb4d8510a0b95d8 diff --git a/meson.build b/meson.build index f430eca..ce2502f 100644 --- a/meson.build +++ b/meson.build @@ -36,7 +36,7 @@ cpp = meson.get_compiler ('cpp') sys = host_machine.system () target = build_machine.cpu_family () version = meson.project_version () -count = run_command ('git', 'rev-list', '--count', 'HEAD').stdout ().strip () +count = run_command ('git', 'rev-list', '--count', 'HEAD', check: false).stdout ().strip () cpp_id = cpp.get_id () cpp_version = cpp.version () @@ -59,14 +59,14 @@ cdata = configuration_data() if win32 cdata.set ('version_win', ','.join (version.split ('.'))) - cdata.set ('machine', run_command ('hostname').stdout ().strip ()) + cdata.set ('machine', run_command ('hostname', check: false).stdout ().strip ()) else cdata.set ('version_win', version) - cdata.set ('machine', run_command ('hostname', '-f').stdout ().strip ()) + cdata.set ('machine', run_command ('hostname', '-f', check: false).stdout ().strip ()) endif -cdata.set ('hash', run_command ('git', 'rev-parse', '--short', 'HEAD').stdout ().strip ()) -cdata.set ('author', run_command ('git', 'log', '--pretty="%ae"', '-1').stdout ().strip ()) +cdata.set ('hash', run_command ('git', 'rev-parse', '--short', 'HEAD', check: false).stdout ().strip ()) +cdata.set ('author', run_command ('git', 'log', '--pretty="%ae"', '-1', check: false).stdout ().strip ()) cdata.set ('count', count) cdata.set ('version', version)