diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-01-05 02:07:59 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-01-09 18:12:47 +0530 |
| commit | 1be6d6ccf59fa0be508fc6e971e03bf663cf2094 (patch) | |
| tree | d2831939009d40d139baf2f03b3298833d31e2a3 /meson.build | |
| parent | 945fd11907e93712f1f3a45f61f9420f59edab38 (diff) | |
| download | gstreamer-1be6d6ccf59fa0be508fc6e971e03bf663cf2094.tar.gz | |
meson: Add explicit check: kwarg to all run_command() calls
This is required since Meson 0.61.0, and causes a warning to be
emitted otherwise:
https://github.com/mesonbuild/meson/commit/2c079d855ed87488bdcc6c5c06f59abdb9b85b6c
https://github.com/mesonbuild/meson/issues/9300
This exposed a bunch of places where we had broken run_command()
calls, unnecessary run_command() calls, and places where check: true
should be used.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1507>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meson.build b/meson.build index d1af0bc8fc..57c3f0070e 100644 --- a/meson.build +++ b/meson.build @@ -24,13 +24,13 @@ ensure_not_uninstalled = ''' import os assert('GST_ENV' not in os.environ) ''' -cmdres = run_command(python3, '-c', ensure_not_uninstalled) +cmdres = run_command(python3, '-c', ensure_not_uninstalled, check: false) if cmdres.returncode() != 0 error('Do not run `ninja` or `meson` for gst-build inside the uninstalled environment, you will run into problems') endif # Install gst-indent pre-commit hook -run_command(python3, '-c', 'import shutil; shutil.copy("scripts/git-hooks/multi-pre-commit.hook", ".git/hooks/pre-commit")') +run_command(python3, '-c', 'import shutil; shutil.copy("scripts/git-hooks/multi-pre-commit.hook", ".git/hooks/pre-commit")', check: false) # Ensure that the user does not have Strawberry Perl in PATH, since it ships # with a pkg-config.bat and broken pkgconfig files for libffi and zlib. Will @@ -41,7 +41,7 @@ import os assert(r'Strawberry\perl\bin' not in os.environ['PATH']) ''' if build_system == 'windows' and meson.version().version_compare('<0.60.0') - cmdres = run_command(python3, '-c', ensure_no_strawberry_perl) + cmdres = run_command(python3, '-c', ensure_no_strawberry_perl, check: false) if cmdres.returncode() != 0 error('You have Strawberry Perl in PATH which is known to cause build issues with Meson < 0.60.0. Please remove it from PATH, uninstall it, or upgrade Meson.') endif @@ -53,9 +53,9 @@ documented_projects = '' if not meson.is_subproject() and cc.get_id() == 'msvc' uname = find_program('uname', required: false) if uname.found() - ret = run_command(uname, '-o') + ret = run_command(uname, '-o', check: false) if ret.returncode() == 0 and ret.stdout().to_lower() == 'msys' - ret = run_command(uname, '-r') + ret = run_command(uname, '-r', check: false) # The kernel version returned by uname is actually the msys version if ret.returncode() == 0 and ret.stdout().startswith('2') # If a system zlib is found, disable UNIX features in zlib.h and zconf.h |