From: Konstantin Belyavskiy <k.belyavskiy@tarantool.org>
To: vdavydov@tarantool.org, georgy@tarantool.org
Cc: tarantool-patches@freelists.org
Subject: [PATCH] [luarocks] Add support for non-standard path
Date: Tue, 27 Mar 2018 19:55:13 +0300 [thread overview]
Message-ID: <20180327165513.7860-1-k.belyavskiy@tarantool.org> (raw)
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)
next reply other threads:[~2018-03-27 16:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-27 16:55 Konstantin Belyavskiy [this message]
2018-03-30 10:40 ` [tarantool-patches] " Georgy Kirichenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180327165513.7860-1-k.belyavskiy@tarantool.org \
--to=k.belyavskiy@tarantool.org \
--cc=georgy@tarantool.org \
--cc=tarantool-patches@freelists.org \
--cc=vdavydov@tarantool.org \
--subject='Re: [PATCH] [luarocks] Add support for non-standard path' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox