diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-04-06 21:07:54 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2018-04-07 21:35:47 -0400 |
| commit | da0f0f02e5463fa04bcb475a108485362a70e261 (patch) | |
| tree | e4cb36dbcf114bcc9586b8455ae2d3184baede45 /mesonbuild/modules | |
| parent | 142f51a7b5c2defc760a57918fb0357477538356 (diff) | |
| download | meson-da0f0f02e5463fa04bcb475a108485362a70e261.zip meson-da0f0f02e5463fa04bcb475a108485362a70e261.tar.gz meson-da0f0f02e5463fa04bcb475a108485362a70e261.tar.bz2 | |
pkgconfig generator: Remove duplicates in required versions
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 6e4f3df..11fa80d 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -133,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 ['>=', '<=', '!=', '==', '=', '>', '<']: |