From c8d125653d0535624741c591397a2b9b4ae3bb43 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 28 Oct 2021 15:04:32 -0400 Subject: python.dependency(): Do not stop when first candidate is not found It has to lookup the dependency with required=False otherwise it raises an exception when the first candidate (pkg-config) failed. --- mesonbuild/modules/python.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mesonbuild/modules/python.py') diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index f183177fe..18fe92613 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -500,11 +500,12 @@ class PythonInstallation(ExternalProgramHolder): if disabled: mlog.log('Dependency', mlog.bold('python'), 'skipped: feature', mlog.bold(feature), 'disabled') else: + new_kwargs = kwargs.copy() + new_kwargs['required'] = False + methods = process_method_kw({DependencyMethods.PKGCONFIG, DependencyMethods.SYSTEM}, kwargs) for d in python_factory(self.interpreter.environment, MachineChoice.BUILD if kwargs.get('native', False) else MachineChoice.HOST, - kwargs, - process_method_kw({DependencyMethods.PKGCONFIG, DependencyMethods.SYSTEM}, kwargs), - self): + new_kwargs, methods, self): dep = d() if dep.found(): break -- cgit v1.2.3