From 6096337904da94486195b0d96b3913024b17b9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 28 Jun 2022 11:41:58 +0400 Subject: [PATCH] pkgconfig: do not add valgrind as requirement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the same reasons commit 7aa28456d ("Add dependency type for Valgrind") removed linking with valgrind, pkgconfig shouldn't generate "Requirements" for it, in general. This solves dbus meson port question/issue from: https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/303#note_1444819 Signed-off-by: Marc-André Lureau --- mesonbuild/modules/pkgconfig.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index dc7eded33..830341cc1 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -116,6 +116,8 @@ class DependenciesHelper: if hasattr(obj, 'generated_pc'): self._check_generated_pc_deprecation(obj) processed_reqs.append(obj.generated_pc) + elif isinstance(obj, dependencies.ValgrindDependency): + pass elif isinstance(obj, dependencies.PkgConfigDependency): if obj.found(): processed_reqs.append(obj.name)