From 08bde945bc580b02b8dd281be46e8ec0bba700f7 Mon Sep 17 00:00:00 2001 From: Sergey Kaplun <skaplun@tarantool.org> Date: Fri, 16 Oct 2020 20:39:50 +0300 Subject: [PATCH] build: provide missing LuaJIT lmisclib.h header Since LuaJIT provides extended LuaC API introduced in the scope of 5a61e1ab54b5c66bfebd836db1ac47996611e065 ('misc: add C and Lua API for platform metrics') corresponding header should be provided along with other Tarantool development files. Follows up #5187 --- FreeBSD/databases/tarantool/pkg-plist | 1 + cmake/luajit.cmake | 2 +- rpm/tarantool.spec | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/FreeBSD/databases/tarantool/pkg-plist b/FreeBSD/databases/tarantool/pkg-plist index 9e3905d601..8e2f3afdef 100644 --- a/FreeBSD/databases/tarantool/pkg-plist +++ b/FreeBSD/databases/tarantool/pkg-plist @@ -3,6 +3,7 @@ bin/tarantoolctl %%ETCDIR%%/default/tarantool %%ETCDIR%%/instances.available/example.lua include/tarantool/lauxlib.h +include/tarantool/lmisclib.h include/tarantool/lua.h include/tarantool/lua.hpp include/tarantool/luaconf.h diff --git a/cmake/luajit.cmake b/cmake/luajit.cmake index 555bc8371b..1c7784e111 100644 --- a/cmake/luajit.cmake +++ b/cmake/luajit.cmake @@ -287,7 +287,7 @@ macro(luajit_build) unset (luajit_buildoptions) set (inc ${PROJECT_SOURCE_DIR}/third_party/luajit/src) install (FILES ${inc}/lua.h ${inc}/lualib.h ${inc}/lauxlib.h - ${inc}/luaconf.h ${inc}/lua.hpp ${inc}/luajit.h + ${inc}/luaconf.h ${inc}/lua.hpp ${inc}/luajit.h ${inc}/lmisclib.h DESTINATION ${MODULE_INCLUDEDIR}) endmacro() diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index eedc0312cd..9ac7a1a040 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -250,6 +250,7 @@ fi %files devel %dir %{_includedir}/tarantool %{_includedir}/tarantool/lauxlib.h +%{_includedir}/tarantool/lmisclib.h %{_includedir}/tarantool/luaconf.h %{_includedir}/tarantool/lua.h %{_includedir}/tarantool/lua.hpp -- GitLab