oasis

commit: bcd889d2c9969a1b6cb538a763f4813d1891446f
parent debf553c14c519d4ca1851af0227ffe694ddc4f6
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 12 Nov 2018 12:13:37 -0800

Call lua as lua5.2 to make sure we get the right version

Diffstat:
M
pkg/ffmpeg/gen.lua
2
+-
M
pkg/python/gen.lua
2
+-
M
pkg/tz/gen.lua
2
+-
M
rules.ninja
2
+-

4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/ffmpeg/gen.lua b/pkg/ffmpeg/gen.lua
@@ -46,7 +46,7 @@ build('awk', '$outdir/include/libavutil/avconfig.h', {'$dir/options.h', '|', '$d
 	expr='-f $dir/avconfig.awk',
 })
 
-rule('genlist', 'lua $dir/list.lua $dir/options.h $type $var <$in >$out.tmp && mv $out.tmp $out')
+rule('genlist', 'lua5.2 $dir/list.lua $dir/options.h $type $var <$in >$out.tmp && mv $out.tmp $out')
 local function genlist(out, src, type, var)
 	build('genlist', out, {src, '|', '$dir/list.lua', '$dir/options.h'}, {type=type, var=var})
 	table.insert(pkg.deps, out)
diff --git a/pkg/python/gen.lua b/pkg/python/gen.lua
@@ -58,7 +58,7 @@ sources = table.keys(sources)
 
 cflags{'-D Py_BUILD_CORE'}
 
-rule('makesetup', 'lua $dir/makesetup.lua $dir/modules.lua <$in >$out.tmp && mv $out.tmp $out')
+rule('makesetup', 'lua5.2 $dir/makesetup.lua $dir/modules.lua <$in >$out.tmp && mv $out.tmp $out')
 build('makesetup', '$outdir/config.c', {'$srcdir/Modules/config.c.in', '|', '$dir/makesetup.lua', '$dir/modules.lua'})
 
 cc('Modules/getbuildinfo.c', nil, {
diff --git a/pkg/tz/gen.lua b/pkg/tz/gen.lua
@@ -16,7 +16,7 @@ local tzdata = {
 	'systemv',
 	'factory',
 }
-rule('tzdata', 'lua $dir/tzdata.lua $repo $outdir/zoneinfo $in >$out.tmp && mv $out.tmp $out')
+rule('tzdata', 'lua5.2 $dir/tzdata.lua $repo $outdir/zoneinfo $in >$out.tmp && mv $out.tmp $out')
 build('tzdata', '$outdir/tzdata.index', {
 	expand{'$srcdir/', tzdata},
 	'|', '$dir/tzdata.lua', 'scripts/hash.sh',
diff --git a/rules.ninja b/rules.ninja
@@ -1,5 +1,5 @@
 rule gen
-  command = lua setup.lua $dir
+  command = lua5.2 setup.lua $dir
   generator = 1
 
 # toolchain