From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Georgy Kirichenko Subject: Re: [tarantool-patches] [PATCH] [luarocks] Add support for non-standard path Date: Fri, 30 Mar 2018 13:40:28 +0300 Message-ID: <2129738.5RKQMh7HCb@localhost> In-Reply-To: <20180327165513.7860-1-k.belyavskiy@tarantool.org> References: <20180327165513.7860-1-k.belyavskiy@tarantool.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1878695.DcGZvSDAa9"; micalg="pgp-sha256"; protocol="application/pgp-signature" To: tarantool-patches@freelists.org Cc: Konstantin Belyavskiy , vdavydov@tarantool.org List-ID: --nextPart1878695.DcGZvSDAa9 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Likes good for me On Tuesday, March 27, 2018 7:55:13 PM MSK Konstantin Belyavskiy wrote: > 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" --nextPart1878695.DcGZvSDAa9 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEFZT35EtIMRTDS5hJnoTdFFzh6LUFAlq+FBwACgkQnoTdFFzh 6LVhLQgAubvitqm1t0EMnHrbkZuyEHOL/kQHRtFZh/Am4uyhhmhF+AJiOsLpqPj8 1D+u54QehLnc8rIsQAK/e5cn5vYIexNGSluYEs1K9uUSF3PS5i4fbwB/HCXzYtbi p6KMZ1H2M/EFlt7kprqRr2aLP5oPUDlGvfEZv+AnHr65ryveNdb9XyyqdWrnYf/T b5klV89gu2X//okrCF8caWwN/fE9970omSV4VZx8V9TnPu8SDzlYsyWVt+6YlhAi OLoirnxqTHs2djtiD2r/zGlo7HV61OleG/5pcbaYjze6erjjI4Cm6CSLdnMeJXux sIhjl1ov1+KoTpwRa0ZoxqLWh+XkOA== =2rDi -----END PGP SIGNATURE----- --nextPart1878695.DcGZvSDAa9--