Merge pull request #3366 from xclaesse/pkgconfig-dup-version

Remove duplicates in generated pkgconfig required versions

mesonbuild/modules/pkgconfig.py

@@ -87,6 +87,7 @@ class DependenciesHelper:
         processed_reqs = []
         processed_cflags = []
         for obj in libs:
+            shared_library_only = getattr(obj, 'shared_library_only', False)
             if hasattr(obj, 'pcdep'):
                 pcdeps = mesonlib.listify(obj.pcdep)
                 for d in pcdeps:
@@ -105,7 +106,7 @@ class DependenciesHelper:
                 if obj.found():
                     processed_libs += obj.get_link_args()
                     processed_cflags += obj.get_compile_args()
-            elif isinstance(obj, build.SharedLibrary) and obj.shared_library_only:
+            elif isinstance(obj, build.SharedLibrary) and shared_library_only:
                 # Do not pull dependencies for shared libraries because they are
                 # only required for static linking. Adding private requires has
                 # the side effect of exposing their cflags, which is the
@@ -132,9 +133,11 @@ class DependenciesHelper:
 
     def add_version_reqs(self, name, version_reqs):
         if version_reqs:
-            vreqs = self.version_reqs.get(name, [])
-            vreqs += mesonlib.stringlistify(version_reqs)
-            self.version_reqs[name] = vreqs
+            if name not in self.version_reqs:
+                self.version_reqs[name] = set()
+            # We could have '>=1.0' or '>= 1.0', remove spaces to normalize
+            new_vreqs = [s.replace(' ', '') for s in mesonlib.stringlistify(version_reqs)]
+            self.version_reqs[name].update(new_vreqs)
 
     def split_version_req(self, s):
         for op in ['>=', '<=', '!=', '==', '=', '>', '<']:

test cases/common/51 pkgconfig-gen/dependencies/meson.build

@@ -11,6 +11,7 @@ pkgg.generate(exposed_lib)
 
 # Declare a few different Dependency objects
 pc_dep = dependency('libfoo', version : '>=1.0')
+pc_dep_dup = dependency('libfoo', version : '>= 1.0')
 notfound_dep = dependency('notfound', required : false)
 threads_dep = dependency('threads')
 custom_dep = declare_dependency(link_args : ['-lcustom'], compile_args : ['-DCUSTOM'])
@@ -24,9 +25,10 @@ custom2_dep = declare_dependency(link_args : ['-lcustom2'], compile_args : ['-DC
 # - Having custom_dep in libraries and libraries_private should only add it in Libs
 # - Having custom2_dep in libraries_private should not add its Cflags
 # - Having pc_dep in libraries_private should add it in Requires.private
+# - pc_dep_dup is the same library and same version, should be ignored
 # - notfound_dep is not required so it shouldn't appear in the pc file.
 pkgg.generate(libraries : [main_lib, exposed_lib, threads_dep , custom_dep],
-  libraries_private : [custom_dep, custom2_dep, pc_dep, notfound_dep],
+  libraries_private : [custom_dep, custom2_dep, pc_dep, pc_dep_dup, notfound_dep],
   version : '1.0',
   name : 'dependency-test',
   filebase : 'dependency-test',