From f5bc0ab44aa66450957a1fb9546b50f8d986d263 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 14 Apr 2019 21:07:58 -0400 Subject: fix gpgme support by preferring pkg-config where possible Since gpgme 1.13.0, pkg-config files are available and this is the preferred way to detect the dependency. Without this, projects that wish to generate pkg-config files that Requires.private on gpgme, now have their custom dependency() fallbacks overridden with an incorrect configtool dependency. --- mesonbuild/dependencies/misc.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mesonbuild/dependencies/misc.py') diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 219b3d6..29149aa 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -680,6 +680,9 @@ class GpgmeDependency(ExternalDependency): methods = cls._process_method_kw(kwargs) candidates = [] + if DependencyMethods.PKGCONFIG in methods: + candidates.append(functools.partial(PkgConfigDependency, 'gpgme', environment, kwargs)) + if DependencyMethods.CONFIG_TOOL in methods: candidates.append(functools.partial(ConfigToolDependency.factory, 'gpgme', environment, None, kwargs, ['gpgme-config'], @@ -696,7 +699,7 @@ class GpgmeDependency(ExternalDependency): @staticmethod def get_methods(): - return [DependencyMethods.CONFIG_TOOL] + return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL] class ShadercDependency(ExternalDependency): -- cgit v1.1