diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2022-04-11 16:15:15 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2022-04-11 17:02:28 -0300 |
commit | eddf776d64941454377f996733f96873cb79bcae (patch) | |
tree | 9ca362c77bd1827feb872f8b67650821012a9d4d /GNUmakefile | |
parent | 21c84dad3ff4e0de10b813260b6a5247771d6754 (diff) | |
download | luarocks-eddf776d64941454377f996733f96873cb79bcae.tar.gz luarocks-eddf776d64941454377f996733f96873cb79bcae.tar.bz2 luarocks-eddf776d64941454377f996733f96873cb79bcae.zip |
Changes for building the all-in-one binary with Lua 5.4
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index f4a6015f..cbb47996 100644 --- a/GNUmakefile +++ b/GNUmakefile | |||
@@ -14,9 +14,10 @@ luadir = $(datarootdir)/lua/$(LUA_VERSION) | |||
14 | builddir = ./build | 14 | builddir = ./build |
15 | buildbinarydir = ./build-binary | 15 | buildbinarydir = ./build-binary |
16 | 16 | ||
17 | |||
18 | LUAROCKS_FILES = $(shell find src/luarocks/ -type f -name '*.lua') | 17 | LUAROCKS_FILES = $(shell find src/luarocks/ -type f -name '*.lua') |
19 | 18 | ||
19 | LUA_ENV_VARS = LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4 LUA_CPATH LUA_CPATH_5_2 LUA_CPATH_5_3 LUA_CPATH_5_4 | ||
20 | |||
20 | all: build | 21 | all: build |
21 | 22 | ||
22 | # ---------------------------------------- | 23 | # ---------------------------------------- |
@@ -51,7 +52,7 @@ luarocks: config.unix $(builddir)/config-$(LUA_VERSION).lua | |||
51 | cp $(builddir)/config-$(LUA_VERSION).lua .luarocks/config-$(LUA_VERSION).lua | 52 | cp $(builddir)/config-$(LUA_VERSION).lua .luarocks/config-$(LUA_VERSION).lua |
52 | rm -f src/luarocks/core/hardcoded.lua | 53 | rm -f src/luarocks/core/hardcoded.lua |
53 | echo "#!/bin/sh" > luarocks | 54 | echo "#!/bin/sh" > luarocks |
54 | echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4 LUA_CPATH LUA_CPATH_5_2 LUA_CPATH_5_3 LUA_CPATH_5_4" >> luarocks | 55 | echo "unset $(LUA_ENV_VARS)" >> luarocks |
55 | echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks | 56 | echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks |
56 | chmod +rx ./luarocks | 57 | chmod +rx ./luarocks |
57 | ./luarocks init | 58 | ./luarocks init |
@@ -59,7 +60,7 @@ luarocks: config.unix $(builddir)/config-$(LUA_VERSION).lua | |||
59 | luarocks-admin: config.unix | 60 | luarocks-admin: config.unix |
60 | rm -f src/luarocks/core/hardcoded.lua | 61 | rm -f src/luarocks/core/hardcoded.lua |
61 | echo "#!/bin/sh" > luarocks-admin | 62 | echo "#!/bin/sh" > luarocks-admin |
62 | echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4 LUA_CPATH LUA_CPATH_5_2 LUA_CPATH_5_3 LUA_CPATH_5_4" >> luarocks-admin | 63 | echo "unset $(LUA_ENV_VARS)" >> luarocks-admin |
63 | echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA)" "$(CURDIR)/src/bin/luarocks-admin" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks-admin | 64 | echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA)" "$(CURDIR)/src/bin/luarocks-admin" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks-admin |
64 | chmod +rx ./luarocks-admin | 65 | chmod +rx ./luarocks-admin |
65 | 66 | ||