diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2024-12-09 14:49:02 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-01-28 10:23:32 -0800 |
| commit | 88d8a3a425dc6af66ca01374d901376502bb9f55 (patch) | |
| tree | 2a51562bd5d885d1210db4bd7cdcf2885580a767 | |
| parent | a47e8f260a7d179462abf7ef607472de44f2f0c5 (diff) | |
| download | meson-88d8a3a425dc6af66ca01374d901376502bb9f55.tar.gz | |
dependencies: version_compare -> version_compare_many
It's possible to get an array of versions here, so we need to handle
that.
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 94f51ff69..2725a7bb4 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -584,7 +584,7 @@ class JNISystemDependency(SystemDependency): self.is_found = False return - if 'version' in kwargs and not version_compare(self.version, kwargs['version']): + if 'version' in kwargs and not version_compare_many(self.version, kwargs['version'])[0]: mlog.error(f'Incorrect JDK version found ({self.version}), wanted {kwargs["version"]}') self.is_found = False return diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 8fdf619f0..6a2a73f2f 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -392,7 +392,7 @@ class CursesSystemDependency(SystemDependency): req = kwargs.get('version') if req: if self.version: - self.is_found = mesonlib.version_compare(self.version, req) + self.is_found, *_ = mesonlib.version_compare_many(self.version, req) else: mlog.warning('Cannot determine version of curses to compare against.') |