From 8a641cac5f7fd01c5e213c170c1babc18088369d Mon Sep 17 00:00:00 2001 From: Charles Brunet Date: Tue, 10 Sep 2024 08:20:22 -0400 Subject: Fix pkgconfig.generate handling of BothLibraries dependencies Was caused by 7b3169f. Fixes #13657. --- mesonbuild/modules/pkgconfig.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'mesonbuild/modules/pkgconfig.py') diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 61de8fc43..1bdf82931 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -195,6 +195,13 @@ class DependenciesHelper: if obj.found(): if obj.objects: raise mesonlib.MesonException('.pc file cannot refer to individual object files.') + + # Ensure BothLibraries are resolved: + if self.pub_libs and isinstance(self.pub_libs[0], build.StaticLibrary): + obj = obj.get_as_static(recursive=True) + else: + obj = obj.get_as_shared(recursive=True) + processed_libs += obj.get_link_args() processed_cflags += obj.get_compile_args() self._add_lib_dependencies(obj.libraries, obj.whole_libraries, obj.ext_deps, public, private_external_deps=True) -- cgit v1.2.3