[PATCH] [luarocks] Add support for non-standard path

Konstantin Belyavskiy k.belyavskiy at tarantool.org
Tue Mar 27 19:55:13 MSK 2018


When tarantool is installed outside "/usr" or "/usr/local" dir
luarocks can't find it. It could be done by either passing
LUAROCKS_PREFIX (which is set by -DCMAKE_INSTALL_PREFIX) to
TARANTOOL_DIR varible:
defaults.variables.TARANTOOL_DIR = site_config.LUAROCKS_PREFIX
Or by passing it to "external_deps_dirs".

Closes #3148
---
 branch: gh-3148-passing-tarantool-dir-to-luarocks
 src/luarocks/cfg.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index cf8a637..0ebe2bf 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -521,7 +521,7 @@ if cfg.platforms.unix then
    defaults.lib_extension = "so"
    defaults.external_lib_extension = "so"
    defaults.obj_extension = "o"
-   defaults.external_deps_dirs = { "/usr/local", "/usr" }
+   defaults.external_deps_dirs = { "/usr/local", "/usr", site_config.LUAROCKS_PREFIX }
    defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "/usr/local/bin"
    defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "/usr/local/include"
    defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "/usr/local/lib"
-- 
2.14.3 (Apple Git-98)




More information about the Tarantool-patches mailing list