Re: [Tarantool-patches] [PATCH 1/2] build: provide missing LuaJIT lmisclib.h header

[Sergey Kaplun <skaplun@tarantool.org>]

Hi, Igor!
Thanks for the review!

On 18.10.20, Igor Munkin wrote:
> Sergey,
> 
> Thanks for the patch! LGTM, except the nits below.
> 
> On 17.10.20, Sergey Kaplun wrote:
> > 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.
> 
> Typo: s/tarantool/Tarantool/.
> Minor: Strictly saying it should not. The header is provided by another
> package (so called "devel" package), so I propose the following wording:
> | corresponding header should be provided along with other Tarantool
> | development files.
> 
> > 
> > Follows up tarantool/tarantool#5187
> 
> Minor: You don't need to use full repo reference here.

Thanks! I've updated commit message considering your comments here.

> 
> > ---
> > 
> > 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?
> 
> I guess no: Gentoo ebuilds are maintained outside the Tarantool repo by
> Sasha Tu. However, I have no idea, how packages for Debian-based distros
> are built. Anyway, it looks everything inside this repo is fixed.
> 
> > 
> > 
> >  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
> 
> Minor: Please sort the entries.

I've sorted entries here and inside rpm/tarantool.spec. See itterative
patch below. Branch is force pushed.

> 
> >  include/tarantool/module.h
> >  man/man1/tarantool.1.gz
> >  man/man1/tarantoolctl.1.gz
> 
> <snipped>
> 
> > 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
> 
> Side note: It looks we totally ignore updating %changelog section.
> 
> > -- 
> > 2.28.0
> > 
> 
> -- 
> Best regards,
> IM

===================================================================
diff --git a/FreeBSD/databases/tarantool/pkg-plist b/FreeBSD/databases/tarantool/pkg-plist
index 6df72be9d..8e2f3afde 100644
--- a/FreeBSD/databases/tarantool/pkg-plist
+++ b/FreeBSD/databases/tarantool/pkg-plist
@@ -3,12 +3,12 @@ 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
 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/rpm/tarantool.spec b/rpm/tarantool.spec
index 3a1a8f2be..9ac7a1a04 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -250,13 +250,13 @@ 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
 %{_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
===================================================================

-- 
Best regards,
Sergey Kaplun