RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-22 15:43:13 +00:00
Code Issues Releases Wiki Activity

build: fix Lua detection

Browse Source 
We need to manually define the flag since we are using a separate identifier
for each of the Lua checks. This was done before 9b45b48 by the composed check
with a define_key (see waftools/checks/generic.py).

The pkg-config check was the only one to not redefine a define key because Waf
already does that automatically when we call the generated function with the
same identifier as the generator function. Now if they are called with two
different arguments we will get two different definitions.

Fixes #1218
This commit is contained in:
Stefano Pigozzi 2014-10-25 22:51:41 +02:00
parent 9b45b48c46
commit 90e3e99021
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
waftools/checks/generic.py
View File

@ -99,8 +99,10 @@ def check_pkg_config(*args, **kw_ext):
result = bool(ctx.check_cfg(**opts)) result = bool(ctx.check_cfg(**opts))
ConfigSet.append_unique = original_append_unique ConfigSet.append_unique = original_append_unique
if not result:
defkey = DependencyInflector(dependency_identifier).define_key() defkey = DependencyInflector(dependency_identifier).define_key()
if result:
ctx.define(defkey, 1)
else:
ctx.undefine(defkey) ctx.undefine(defkey)
return result return result
return fn return fn