diff options
author | Robin Gareus <robin@gareus.org> | 2020-01-20 23:08:55 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2020-01-25 04:07:41 +0100 |
commit | 19603d075f7013453c79711a646301df694c7b03 (patch) | |
tree | 11372f869f868b521b465610ecc5c91d216a1f55 /tools/autowaf.py | |
parent | 2e9ac80e998bc79d5ef9029415008198b22168dc (diff) |
Update waf to v2.0.19
Diffstat (limited to 'tools/autowaf.py')
-rw-r--r-- | tools/autowaf.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/autowaf.py b/tools/autowaf.py index f82b80a83f..375dc5909a 100644 --- a/tools/autowaf.py +++ b/tools/autowaf.py @@ -140,14 +140,13 @@ def check_pkg(conf, name, **args): found = None pkg_var_name = 'PKG_' + name.replace('-', '_') pkg_name = name - if conf.env.PARDEBUG: - args['mandatory'] = False # Smash mandatory arg - found = conf.check_cfg(package=pkg_name + 'D', args="--cflags --libs", **args) - if found: - pkg_name += 'D' if mandatory: args['mandatory'] = True # Unsmash mandatory arg - if not found: + if 'atleast_version' in args: + if not 'msg' in args: + args['msg'] = 'Checking for %r >= %s' %(pkg_name, args['atleast_version']) + found = conf.check_cfg(package=pkg_name, args=[pkg_name + " >= " + args['atleast_version'], '--cflags', '--libs'], **args) + else: found = conf.check_cfg(package=pkg_name, args="--cflags --libs", **args) if found: conf.env[pkg_var_name] = pkg_name |