From 26989e190460a2d6b4768a6918826bb658cf5a99 Mon Sep 17 00:00:00 2001 From: Alexander M Pickering Date: Wed, 25 Sep 2024 17:37:08 -0500 Subject: Only patch luarocks.exe.c on lua 5.1 --- init | 4 +++- meta.lua | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/init b/init index 9ef18f5..6b8c5a7 100755 --- a/init +++ b/init @@ -12,6 +12,8 @@ mkdir build-binary sed -i 's/local program_version = "dev"/local program_version = "lua4.win"/g' /root/luarocks/src/luarocks/core/cfg.lua patch -i /root/luarocks-packaging/all_in_one.patch binary/all_in_one LUAROCKS_CROSS_COMPILING=1 lua5.4 binary/all_in_one "src/bin/luarocks" "" "^src/luarocks/admin/" "/config" "build-binary" "yes" "windows" -patch -i /root/luarocks-packaging/luarocks.exe.c.patch build-binary/luarocks.exe.c +if [ "$LUA_VER" = "51" ]; then + patch -i /root/luarocks-packaging/luarocks.exe.c.patch build-binary/luarocks.exe.c +fi gcc -o build-binary/luarocks.exe -Oz build-binary/luarocks.exe.c -I/root/lua/src /root/libbz2.a /root/libssl.a /root/libz.a /root/liblua.a -mconsole -mwindows -lm cp build-binary/luarocks.exe /root diff --git a/meta.lua b/meta.lua index a92e48b..d591548 100644 --- a/meta.lua +++ b/meta.lua @@ -69,6 +69,7 @@ for version_k, version_v, opti_k, opti_v, debug_k, debug_v, comp_k, comp_v in ca }, env = { CFLAGS=" " .. opti_v .. " " .. debug_v, + LUA_VER=version_k, } } if version_k ~= "jit" then -- cgit v1.2.3-55-g6feb