commit ab9fb33c708ae2d889fc36da9ade135ca82c07fc
author Samuel Thibault <samuel.thibault@ens-lyon.org> Fri May 13 21:29:59 2022 +0200
committer Samuel Thibault <samuel.thibault@ens-lyon.org> Sat May 28 22:09:00 2022 +0200
tree 522599a9bd562df462b9e776328b794532a0f3d4
parent a066eb6ca7537d03aec51b4fc5e39b3a556b46f5

Accept build-aux/git-version-gen failing to run

and just revert to meson.project_version()

meson.build

diff --git a/meson.build b/meson.build
index 435f331..611ebc2 100644
--- a/meson.build
+++ b/meson.build
@@ -16,10 +16,12 @@
 conf.set('SLIRP_MINOR_VERSION', minor_version)
 conf.set('SLIRP_MICRO_VERSION', micro_version)
 
-full_version = run_command('build-aux/git-version-gen',
-                           '@0@/.tarball-version'.format(meson.current_source_dir()),
-                           check : true).stdout().strip()
-if full_version.startswith('UNKNOWN')
+r = run_command('build-aux/git-version-gen',
+                '@0@/.tarball-version'.format(meson.current_source_dir()),
+                check : false)
+
+full_version = r.stdout().strip()
+if r.returncode() != 0 or full_version.startswith('UNKNOWN')
   full_version = meson.project_version()
 elif not full_version.startswith(meson.project_version())
   error('meson.build project version @0@ does not match git-describe output @1@'