From 5f3d12abc814b9ea99e56ea31b79a4cb3e8411fc Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 4 Sep 2025 15:26:33 +0200 Subject: pkgconfig: Fix class cached to be keyed on extra_paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add `extra_paths` to cache keys for `PkgConfigInterface` and `PkgConfigCLI` instances, to avoid incorrectly reusing an instance with a different `extra_paths` value, see: https://github.com/mesonbuild/meson/pull/14657#discussion_r2320623799 Signed-off-by: Michał Górny --- run_project_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'run_project_tests.py') diff --git a/run_project_tests.py b/run_project_tests.py index ce6e5c2da..b2442703e 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -555,8 +555,8 @@ def clear_internal_caches() -> None: from mesonbuild.mesonlib import PerMachine mesonbuild.interpreterbase.FeatureNew.feature_registry = {} CMakeDependency.class_cmakeinfo = PerMachine(None, None) - PkgConfigInterface.class_impl = PerMachine(False, False) - PkgConfigInterface.class_cli_impl = PerMachine(False, False) + PkgConfigInterface.class_impl = PerMachine({}, {}) + PkgConfigInterface.class_cli_impl = PerMachine({}, {}) PkgConfigInterface.pkg_bin_per_machine = PerMachine(None, None) -- cgit v1.2.3