pkgconfig: Implement early dependency merging

Due to performance reasons, we have to do the dependency resolution
on the qbspkg-config side, like original pkg-config does.
Otherwise, it is not possible to use GRPC module as it depends on a
bunch of ABSEIL libraries which has a lot of cross-dependencies and
QBS cannot handle them (resolving takes > 10 minutes for a simple
dependency on GRPC).

Change-Id: Ice25f6cea09fe731a511d91891936ba746e5b697
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 3 insertions, 0 deletions

diff --git a/share/qbs/module-providers/qbspkgconfig.qbs b/share/qbs/module-providers/qbspkgconfig.qbs
index 40f0526ed..5309610e1 100644
--- a/share/qbs/module-providers/qbspkgconfig.qbs
+++ b/share/qbs/module-providers/qbspkgconfig.qbs
@@ -54,6 +54,7 @@ ModuleProvider {
             return "";
         return qbs.sysroot;
     }
+    property bool mergeDependencies: true
 
     relativeSearchPaths: {
 
@@ -143,6 +144,8 @@ ModuleProvider {
         var options = {};
         options.searchPaths = libDirs;
         options.sysroot = sysroot;
+        options.staticMode = staticMode;
+        options.mergeDependencies = mergeDependencies;
         if (options.sysroot && !options.searchPaths) {
             options.searchPaths = [
                 sysroot + "/usr/lib/pkgconfig",