From d7adb818b01515aedc72c955ccf1936a5aa58fa9 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 2 Dec 2014 22:09:29 +0100 Subject: 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. --- waftools/checks/custom.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'waftools') 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: -- cgit v1.2.3