diff options
author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-06-01 12:08:07 +0100 |
---|---|---|
committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-08-01 14:26:02 +0100 |
commit | b744d56fc7ee7ec7ca738489f694fdc5b719d3a2 (patch) | |
tree | b1f422cfd180ce64d256f7011427bacdfc5c5dec | |
parent | f2673d9b57d0134c293e7acf5af5a0b3364523fb (diff) | |
download | meson-b744d56fc7ee7ec7ca738489f694fdc5b719d3a2.zip meson-b744d56fc7ee7ec7ca738489f694fdc5b719d3a2.tar.gz meson-b744d56fc7ee7ec7ca738489f694fdc5b719d3a2.tar.bz2 |
Restore and improve cross/native dependency type reporting
If we aren't cross-building, this distinction isn't very interesting
(Most dependencies didn't bother reporting this. pkgconfig did it
unconditionally, and Qt reported as 'native' or 'cross' depending on
is_cross_build(), i.e. ignoring the native: keyword)
-rw-r--r-- | mesonbuild/dependencies/base.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 8fdc10e..c44f6e3 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1250,6 +1250,13 @@ def find_external_dependency(name, env, kwargs): if name.lower() not in _packages_accept_language and 'language' in kwargs: raise DependencyException('%s dependency does not accept "language" keyword argument' % (name, )) + # if this isn't a cross-build, it's uninteresting if native: is used or not + if not env.is_cross_build(): + type_text = 'Dependency' + else: + type_text = 'Native' if kwargs.get('native', False) else 'Cross' + type_text += ' dependency' + # build a list of dependency methods to try candidates = _build_external_dependency_list(name, env, kwargs) @@ -1281,7 +1288,7 @@ def find_external_dependency(name, env, kwargs): if info: info = ', ' + info - mlog.log('Dependency', mlog.bold(name), details + 'found:', mlog.green('YES'), d.version + info) + mlog.log(type_text, mlog.bold(name), details + 'found:', mlog.green('YES'), d.version + info) return d @@ -1292,7 +1299,7 @@ def find_external_dependency(name, env, kwargs): else: tried = '' - mlog.log('Dependency', mlog.bold(name), details + 'found:', mlog.red('NO'), + mlog.log(type_text, mlog.bold(name), details + 'found:', mlog.red('NO'), '(tried {})'.format(tried) if tried else '') if required: |