From d0409b2ccd90bf61d17da5228502c1ae7657a094 Mon Sep 17 00:00:00 2001 From: Alexander M Pickering Date: Wed, 25 Sep 2024 17:25:01 -0500 Subject: Work on luajit+luarocks --- meta.lua | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/meta.lua b/meta.lua index c56df8d..cdc03e7 100644 --- a/meta.lua +++ b/meta.lua @@ -1,27 +1,52 @@ local lua_versions = { + --[[ ["51"] = { link = "https://www.lua.org/ftp/lua-5.1.5.tar.gz", slib = "liblua.a", bin = "lua.exe", dlib = "lua51.dll" }, - ["52"] = {"liblua.a", "lua.exe", "lua52.dll"}, - ["53"] = {"liblua.a", "lua.exe", "lua53.dll"}, - ["54"] = {"liblua.a", "lua.exe", "lua54.dll"}, - ["jit"] = {"libluajit.a", "luajit.exe", "lua51.dll"}, + ["52"] = { + link = "https://www.lua.org/ftp/lua-5.2.4.tar.gz", + slib = "liblua.a", + bin = "lua.exe", + dlib = "lua52.dll" + }, + ["53"] = { + link = "https://www.lua.org/ftp/lua-5.3.6.tar.gz", + slib = "liblua.a", + bin = "lua.exe", + dlib = "lua53.dll" + }, + ["54"] = { + link = "https://www.lua.org/ftp/lua-5.4.7.tar.gz", + slib = "liblua.a", + bin = "lua.exe", + dlib = "lua54.dll" + }, + ]] + ["jit"] = { + slib = "libluajit.a", + bin = "luajit.exe", + dlib = "lua51.dll" + } } local optimizations = { tiny = "-Oz", + --[[ size = "-Os", debug = "-Og", zero = "-O0", one = "-O1", two = "-O2", three = "-O3", + ]] } local debug = { release = "", + --[[ debug = "-g", + ]] } local compilers = {--[["mingw32",]]"mingw64"--[[,"clang32","clang64"]]} @@ -47,6 +72,11 @@ for version_k, version_v, opti_k, opti_v, debug_k, debug_v, comp_k, comp_v in ca CFLAGS=" " .. opti_v .. " " .. debug_v, } } + if version_k ~= "jit" then + builds[name].requires[#builds[name].requires + 1] = {"http", version_v.link} + else + builds[name].requires[#builds[name].requires + 1] = {"git", "luajit"} + end --[[ builds[name .. "-test"] = { image="image-wine", @@ -60,4 +90,5 @@ for version_k, version_v, opti_k, opti_v, debug_k, debug_v, comp_k, comp_v in ca } ]] end + return builds -- cgit v1.2.3-55-g6feb