modules/pkgconfig: Resolve dependencies in case of an internal dependency

When giving a dependency object as requires, allow to use the dependency from a
subproject (that is an InternalDepdency).

Author: tintou

mesonbuild/modules/pkgconfig.py

@@ -156,6 +156,14 @@ def _process_reqs(self, reqs: T.Sequence[T.Union[str, build.StaticLibrary, build
                 pass
             elif isinstance(obj, dependencies.ExternalDependency) and obj.name == 'threads':
                 pass
+            elif isinstance(obj, dependencies.InternalDependency) and all(lib.get_id() in self.metadata for lib in obj.libraries):
+                # 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)
+                for lib in obj.libraries:
+                    processed_reqs.append(self.metadata[lib.get_id()].filebase)
             else:
                 raise mesonlib.MesonException('requires argument not a string, '
                                               'library with pkgconfig-generated file '

test cases/common/283 pkgconfig subproject/meson.build

@@ -0,0 +1,13 @@
+project('test1', 'c', meson_version: '>=1.9.0')
+pkg = import('pkgconfig')
+
+test2_dep = dependency('test2')
+
+test1_lib = library('test1',
+    'test1.c',
+    dependencies: [test2_dep]
+)
+
+pkg.generate(test1_lib,
+requires: test2_dep,
+)

test cases/common/283 pkgconfig subproject/subprojects/test2/meson.build

@@ -0,0 +1,16 @@
+project('test2', 'c', meson_version: '>=1.9.0')
+pkg = import('pkgconfig')
+
+test2_lib = library(
+    'test2',
+    'test2.c',
+)
+
+test2_dep = declare_dependency(
+    link_with: test2_lib,
+    include_directories: include_directories('.')
+)
+
+pkg.generate(test2_lib)
+
+meson.override_dependency('test2', test2_dep)

test cases/common/283 pkgconfig subproject/subprojects/test2/test2.c

@@ -0,0 +1,3 @@
+int exposed_function2(void) {
+    return 42;
+}

test cases/common/283 pkgconfig subproject/test.json

@@ -0,0 +1,15 @@
+{
+    "installed": [
+        { "type": "file", "file": "usr/lib/pkgconfig/test1.pc"},
+        { "type": "file", "file": "usr/lib/pkgconfig/test2.pc"}
+    ],
+    "matrix": {
+        "options": {
+            "default_library": [
+                { "val": "shared" },
+                { "val": "static" },
+                { "val": "both" }
+            ]
+        }
+    }
+}

test cases/common/283 pkgconfig subproject/test1.c

@@ -0,0 +1,3 @@
+int exposed_function(void) {
+    return 42;
+}