summaryrefslogtreecommitdiffstats
path: root/waftools
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-12-02 22:09:29 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-12-02 22:10:13 +0100
commitd7adb818b01515aedc72c955ccf1936a5aa58fa9 (patch)
treea0099216ef5b803b01076168a8b11c77b5fa2bb6 /waftools
parente7145ae24d9e9c5d5728d4347881a8780a6b8b29 (diff)
downloadmpv-d7adb818b01515aedc72c955ccf1936a5aa58fa9.tar.bz2
mpv-d7adb818b01515aedc72c955ccf1936a5aa58fa9.tar.xz
build: give precedence to Lua52 over LuaJIT
LuaJIT ships with a broken .pc file on OS X (see #1110), and leaving Lua52 last was done only to improve libquvi interoperability.
Diffstat (limited to 'waftools')
-rw-r--r--waftools/checks/custom.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py
index fc57bd92d5..3126868164 100644
--- a/waftools/checks/custom.py
+++ b/waftools/checks/custom.py
@@ -49,11 +49,10 @@ def check_lua(ctx, dependency_identifier):
( '51', 'lua >= 5.1.0 lua < 5.2.0'),
( '51deb', 'lua5.1 >= 5.1.0'), # debian
( '51fbsd', 'lua-5.1 >= 5.1.0'), # FreeBSD
- ( 'luajit', 'luajit >= 2.0.0' ),
- # assume all our dependencies link with 5.1
( '52', 'lua >= 5.2.0' ),
( '52deb', 'lua5.2 >= 5.2.0'), # debian
( '52fbsd', 'lua-5.2 >= 5.2.0'), # FreeBSD
+ ( 'luajit', 'luajit >= 2.0.0' ),
]
if ctx.options.LUA_VER: