From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp38.i.mail.ru (smtp38.i.mail.ru [94.100.177.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id A1973469719 for ; Sat, 17 Oct 2020 14:14:04 +0300 (MSK) From: Sergey Kaplun Date: Sat, 17 Oct 2020 14:13:30 +0300 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 1/2] build: provide missing LuaJIT lmisclib.h header List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Turenko , Igor Munkin , "Alexander V . Tikhonov" Cc: tarantool-patches@dev.tarantool.org 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 installed together with tarantool. Follows up tarantool/tarantool#5187 --- I checked all references of LuaJIT provided headers as follows: =================================================================== grep "lualib.h" -R ~/builds_workspace/tarantool/master/ | grep -v -e tags -e CMakeFiles -e "#include" -e Makefile.dep -e third_party /home/burii/builds_workspace/tarantool/master/rpm/tarantool.spec:%{_includedir}/tarantool/lualib.h Binary file /home/burii/builds_workspace/tarantool/master/cmake/.luajit.cmake.swp matches /home/burii/builds_workspace/tarantool/master/cmake/luajit.cmake: install (FILES ${inc}/lua.h ${inc}/lualib.h ${inc}/lauxlib.h /home/burii/builds_workspace/tarantool/master/FreeBSD/databases/tarantool/pkg-plist:include/tarantool/lualib.h =================================================================== Did I miss something? 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 9e3905d60..6df72be9d 100644 --- a/FreeBSD/databases/tarantool/pkg-plist +++ b/FreeBSD/databases/tarantool/pkg-plist @@ -8,6 +8,7 @@ include/tarantool/lua.hpp include/tarantool/luaconf.h include/tarantool/luajit.h include/tarantool/lualib.h +include/tarantool/lmisclib.h include/tarantool/module.h man/man1/tarantool.1.gz man/man1/tarantoolctl.1.gz diff --git a/cmake/luajit.cmake b/cmake/luajit.cmake index 555bc8371..1c7784e11 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 eedc0312c..3a1a8f2be 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -256,6 +256,7 @@ fi %{_includedir}/tarantool/luajit.h %{_includedir}/tarantool/lualib.h %{_includedir}/tarantool/module.h +%{_includedir}/tarantool/lmisclib.h %changelog * Tue Sep 12 2017 Roman Tsisyk 1.7.5.46-1 -- 2.28.0