FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tools: c_config: pkg-config is indeed a list of strings

This commit is contained in:
Jérôme Carretero 2013-09-04 23:21:19 -04:00
parent d6dd3fd8ab
commit 8d37f79ea2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
waflib/Tools/c_config.py
View File

@ -273,7 +273,7 @@ def exec_cfg(self, kw):
# pkg-config version
if 'atleast_pkgconfig_version' in kw:
cmd = [kw['path'], '--atleast-pkgconfig-version=%s' % kw['atleast_pkgconfig_version']]
cmd = kw['path'] + ['--atleast-pkgconfig-version=%s' % kw['atleast_pkgconfig_version']]
self.cmd_and_log(cmd)
if not 'okmsg' in kw:
kw['okmsg'] = 'yes'
@ -283,7 +283,7 @@ def exec_cfg(self, kw):
for x in cfg_ver:
y = x.replace('-', '_')
if y in kw:
self.cmd_and_log([kw['path'], '--%s=%s' % (x, kw[y]), kw['package']])
self.cmd_and_log(kw['path'] + ['--%s=%s' % (x, kw[y]), kw['package']])
if not 'okmsg' in kw:
kw['okmsg'] = 'yes'
define_it()
@ -291,11 +291,11 @@ def exec_cfg(self, kw):
# retrieving the version of a module
if 'modversion' in kw:
version = self.cmd_and_log([kw['path'], '--modversion', kw['modversion']]).strip()
version = self.cmd_and_log(kw['path'] + ['--modversion', kw['modversion']]).strip()
self.define('%s_VERSION' % Utils.quote_define_name(kw.get('uselib_store', kw['modversion'])), version)
return version
lst = [kw['path']]
lst = kw['path']
defi = kw.get('define_variable', None)
if not defi: