diff --git a/changelogs/unreleased/luarocks-disable-force-config.md b/changelogs/unreleased/luarocks-disable-force-config.md new file mode 100644 index 0000000000000000000000000000000000000000..4d18a7a09fe20798749d997aeefb96be54da3aad --- /dev/null +++ b/changelogs/unreleased/luarocks-disable-force-config.md @@ -0,0 +1,3 @@ +## luarocks + + * set FORCE_CONFIG=false for luarocks config to allow loading project-side .rocks/config-5.1.lua diff --git a/extra/luarocks/hardcoded.lua.cmake b/extra/luarocks/hardcoded.lua.cmake index 3f51c1deb9ba4880870d1ee650989e0e0395e5fc..ed2cd45484f74914b8d50933c875ba378de21164 100644 --- a/extra/luarocks/hardcoded.lua.cmake +++ b/extra/luarocks/hardcoded.lua.cmake @@ -6,7 +6,7 @@ LUA_INTERPRETER=[[tarantool]], LUA_MODULES_LIB_SUBDIR=[[/lib/tarantool]], LUA_MODULES_LUA_SUBDIR=[[/share/tarantool]], SYSCONFDIR=[[@CMAKE_INSTALL_FULL_SYSCONFDIR@/tarantool/rocks]], -FORCE_CONFIG=true, +FORCE_CONFIG=false, ROCKS_TREE=[[/usr/local/]], ROCKS_SUBDIR=[[/share/tarantool/rocks]], ROCKS_SERVERS={