RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Detect Lua on FreeBSD

This commit is contained in:
Grzegorz Blach 2014-01-14 23:49:26 +01:00 committed by wm4
parent 635b2f2690
commit 8255400e9c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waftools/checks/custom.py
View File

@ -52,10 +52,12 @@ def check_lua(ctx, dependency_identifier):
lua_versions = [ lua_versions = [
( '51', 'lua >= 5.1.0 lua < 5.2.0'), ( '51', 'lua >= 5.1.0 lua < 5.2.0'),
( '51deb', 'lua5.1 >= 5.1.0'), # debian ( '51deb', 'lua5.1 >= 5.1.0'), # debian
( '51fbsd', 'lua-5.1 >= 5.1.0'), # FreeBSD
( 'luajit', 'luajit >= 2.0.0' ), ( 'luajit', 'luajit >= 2.0.0' ),
# assume all our dependencies (libquvi in particular) link with 5.1 # assume all our dependencies (libquvi in particular) link with 5.1
( '52', 'lua >= 5.2.0' ), ( '52', 'lua >= 5.2.0' ),
( '52deb', 'lua5.2 >= 5.2.0'), # debian ( '52deb', 'lua5.2 >= 5.2.0'), # debian
( '52fbsd', 'lua-5.2 >= 5.2.0'), # FreeBSD
] ]
if ctx.options.LUA_VER: if ctx.options.LUA_VER:

2
wscript
View File

@ -765,7 +765,7 @@ def options(opt):
group.add_option('--lua', group.add_option('--lua',
type = 'string', type = 'string',
dest = 'LUA_VER', dest = 'LUA_VER',
help = "select Lua package which should be autodetected. Choices: 51 51deb 52 52deb luajit") help = "select Lua package which should be autodetected. Choices: 51 51deb 51fbsd 52 52deb 52fbsd luajit")
@conf @conf
def is_debug_build(ctx): def is_debug_build(ctx):