diff options
author | wm4 <wm4@nowhere> | 2020-02-29 20:11:13 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2020-02-29 21:49:14 +0100 |
commit | d852ad2ae76c97fce710e41064c863842db87035 (patch) | |
tree | 3c6006a5c2817a3a4248c9fe49c3954fc59ca7d6 | |
parent | c79619f11065bd630b05c191745bf54becd4c3b9 (diff) | |
download | mpv-d852ad2ae76c97fce710e41064c863842db87035.tar.bz2 mpv-d852ad2ae76c97fce710e41064c863842db87035.tar.xz |
build: pick up Lua 5.2 by default
Previously: 5.1 > 5.2 > luajit
Now: 5.2 > luajit > 5.1
I randomly decided that this should be done, since I suspect most
environments will prefer the highest Lua version anyway. There is not
much of a point picking the older one by default.
Maybe 5.1 should be dropped fully, but considering we need to stay
compatible with luajit, there is no particular incentive for this.
-rw-r--r-- | waftools/checks/custom.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py index ed5865a25c..7ca8f8655c 100644 --- a/waftools/checks/custom.py +++ b/waftools/checks/custom.py @@ -58,15 +58,15 @@ def check_iconv(ctx, dependency_identifier): def check_lua(ctx, dependency_identifier): lua_versions = [ - ( '51', 'lua >= 5.1.0 lua < 5.2.0'), - ( '51obsd', 'lua51 >= 5.1.0'), # OpenBSD - ( '51deb', 'lua5.1 >= 5.1.0'), # debian - ( '51fbsd', 'lua-5.1 >= 5.1.0'), # FreeBSD ( '52', 'lua >= 5.2.0 lua < 5.3.0' ), ( '52arch', 'lua52 >= 5.2.0'), # Arch ( '52deb', 'lua5.2 >= 5.2.0'), # debian ( '52fbsd', 'lua-5.2 >= 5.2.0'), # FreeBSD ( 'luajit', 'luajit >= 2.0.0' ), + ( '51', 'lua >= 5.1.0 lua < 5.2.0'), + ( '51obsd', 'lua51 >= 5.1.0'), # OpenBSD + ( '51deb', 'lua5.1 >= 5.1.0'), # debian + ( '51fbsd', 'lua-5.1 >= 5.1.0'), # FreeBSD ] if ctx.options.LUA_VER: |