From: Sergey Kaplun <skaplun@tarantool.org>
To: Alexander Turenko <alexander.turenko@tarantool.org>,
Igor Munkin <imun@tarantool.org>,
"Alexander V . Tikhonov" <avtikhon@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH 1/2] build: provide missing LuaJIT lmisclib.h header
Date: Sat, 17 Oct 2020 14:13:30 +0300 [thread overview]
Message-ID: <b0e94740bf2d0cb1d89181a916f411ece2e637f6.1602931403.git.skaplun@tarantool.org> (raw)
In-Reply-To: <cover.1602931403.git.skaplun@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 <roman@tarantool.org> 1.7.5.46-1
--
2.28.0
next prev parent reply other threads:[~2020-10-17 11:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-17 11:13 [Tarantool-patches] [PATCH 0/2] Minor fixes for new LuaJIT extention library Sergey Kaplun
2020-10-17 11:13 ` Sergey Kaplun [this message]
2020-10-18 19:19 ` [Tarantool-patches] [PATCH 1/2] build: provide missing LuaJIT lmisclib.h header Igor Munkin
2020-10-19 4:55 ` Sergey Kaplun
2020-10-20 12:07 ` Sergey Ostanevich
2020-10-17 11:13 ` [Tarantool-patches] [PATCH 2/2] lua: add missing LuaJIT export symbols Sergey Kaplun
2020-10-18 18:43 ` Igor Munkin
2020-10-19 4:57 ` Sergey Kaplun
2020-10-20 12:09 ` Sergey Ostanevich
2020-10-20 13:03 ` Sergey Kaplun
2020-10-21 16:08 ` [Tarantool-patches] [PATCH 0/2] Minor fixes for new LuaJIT extention library Alexander Turenko
2020-10-21 16:17 ` Alexander V. Tikhonov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b0e94740bf2d0cb1d89181a916f411ece2e637f6.1602931403.git.skaplun@tarantool.org \
--to=skaplun@tarantool.org \
--cc=alexander.turenko@tarantool.org \
--cc=avtikhon@tarantool.org \
--cc=imun@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 1/2] build: provide missing LuaJIT lmisclib.h header' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox