dependencies: version_compare -> version_compare_many

It's possible to get an array of versions here, so we need to handle
that.
pull/14198/head
Dylan Baker 2 months ago
parent a47e8f260a
commit 88d8a3a425
  1. 2
      mesonbuild/dependencies/dev.py
  2. 2
      mesonbuild/dependencies/misc.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

@ -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.')

Loading…
Cancel
Save