dependencies: version_compare -> version_compare_many

It's possible to get an array of versions here, so we need to handle that.
mesonbuild · Dec 20, 2024 · a7de9ad · a7de9ad
1 parent 036caec
commit a7de9ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
@@ -584,7 +584,7 @@ def __init__(self, environment: 'Environment', kwargs: JNISystemDependencyKW):
                 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']):
             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
@@ -371,7 +371,7 @@ def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]):
                         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.')