[Tarantool-patches] [PATCH 0/3] Adjust LuaJIT build system

Igor Munkin imun at tarantool.org
Thu Feb 4 02:22:14 MSK 2021


The first patch of this series fixes the inaccuracy for out of source
build type. If Lua source path given to <lua_source> function is
relative, the output file is generated in the binary directory. At the
same time if the given path to be compiled to *.lua.c is absolute, the
output file is generated in source directory instead of the binary one.

In scope of the second patch the module for building the bundled LuaJIT
is completely reworked considering the changes made in LuaJIT repo[1].

The last patch adds LuaJIT tests to every CI job type except the one for
static build testing routine on OSX: there is no way to run LuaJIT tests
for out of source build on OSX due to SIP[2].

[1]: https://lists.tarantool.org/tarantool-patches/cover.1612291495.git.imun@tarantool.org/T/#t
[2]: https://developer.apple.com/library/archive/documentation/Security/Conceptual/System_Integrity_Protection_Guide/FileSystemProtections/FileSystemProtections.html

Branch: https://github.com/tarantool/tarantool/tree/imun/gh-4862-cmake-full-ci
Issues:
* https://github.com/tarantool/tarantool/issues/4862
* https://github.com/tarantool/tarantool/issues/5470

CI is not green since OSX 11 is pretty stormy today. Hope it will be
fine the day when the changeset is merged into the trunk.

@ChangeLog:
* Port LuaJIT build system to CMake and make its testing environment
  self-sufficient (gh-4862, gh-5470).

Igor Munkin (3):
  build: fix lua.c file generation
  build: adjust LuaJIT build system
  ci: enable LuaJIT tests in CI

 .luacheckrc         |   1 -
 .travis.mk          |  20 +++
 CMakeLists.txt      |   2 +-
 cmake/luajit.cmake  | 375 ++++++++++++--------------------------------
 cmake/luatest.cpp   |  80 ----------
 cmake/utils.cmake   |   6 +-
 debian/control      |   2 +
 rpm/tarantool.spec  |   2 +
 src/CMakeLists.txt  |  28 ++--
 test/CMakeLists.txt |  18 +--
 third_party/luajit  |   2 +-
 11 files changed, 143 insertions(+), 393 deletions(-)
 delete mode 100644 cmake/luatest.cpp

-- 
2.25.0



More information about the Tarantool-patches mailing list