diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2022-06-02 22:31:35 -0400 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2022-06-03 06:42:58 -0400 |
commit | 3e2dba5b7cd107f60474b3cb01c307a9e2354868 (patch) | |
tree | c984de319afbd83a6e59b1e37442bb33d6235201 | |
parent | 53f44d980bf4d9eabef3b7b6ee842fa6c9f03b59 (diff) | |
download | meson-3e2dba5b7cd107f60474b3cb01c307a9e2354868.zip meson-3e2dba5b7cd107f60474b3cb01c307a9e2354868.tar.gz meson-3e2dba5b7cd107f60474b3cb01c307a9e2354868.tar.bz2 |
devenv: do not fatally error if pkg-config or bash-completion is not available
We might be using all fallbacks, or be super weird and not use
bash-completion, or simply have a different PKG_CONFIG_LIBDIR set. And
devenv already checks whether the dependency is found, but defaults to
required anyway, which is wrong.
-rw-r--r-- | mesonbuild/mdevenv.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mdevenv.py b/mesonbuild/mdevenv.py index f5dcf30..8f4a351 100644 --- a/mesonbuild/mdevenv.py +++ b/mesonbuild/mdevenv.py @@ -96,7 +96,7 @@ def get_env(b: build.Build, build_dir: str) -> T.Tuple[T.Dict[str, str], T.Set[s def bash_completion_files(b: build.Build, install_data: 'InstallData') -> T.List[str]: result = [] dep = dependencies.PkgConfigDependency('bash-completion', b.environment, - {'silent': True, 'version': '>=2.10'}) + {'required': False, 'silent': True, 'version': '>=2.10'}) if dep.found(): prefix = b.environment.coredata.get_option(OptionKey('prefix')) assert isinstance(prefix, str), 'for mypy' |