[Tarantool-patches] [PATCH luajit v2 2/6] build: fix tool components handling

Maxim Kokryashkin m.kokryashkin at tarantool.org
Tue Dec 12 15:53:27 MSK 2023


Hi, Sergey!
Thanks for the review!
Fixed, branch is force-pushed.
See the iterative diff below:


On Tue, Dec 12, 2023 at 01:32:17PM +0300, Sergey Kaplun wrote:
> Hi, Maxim!
> Thanks for the patch!
> Please, consider my comments below.
>
> On 06.12.23, Maxim Kokryashkin wrote:
>
> <snipped>
>
> > diff --git a/Makefile.original b/Makefile.original
> > index e67b6aa8..2a56d648 100644
> > --- a/Makefile.original
> > +++ b/Makefile.original
>
> <snipped>
>
> > @@ -95,7 +98,8 @@ FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \
> >  	      dis_arm64be.lua dis_ppc.lua dis_mips.lua dis_mipsel.lua \
> >  	      dis_mips64.lua dis_mips64el.lua vmdef.lua
> >  FILES_UTILSLIB= avl.lua bufread.lua symtab.lua
> > -FILES_MEMPROFLIB= parse.lua humanize.lua
> > +FILES_MEMPROFLIB= parse.lua humanize.lua process.lua
>
> Minor: Please use the aphabetic order here instead.
>
> > +FILES_SYSPROFLIB= parse.lua
> >  FILES_TOOLSLIB= memprof.lua
>
> I suppose we should include <sysprof.lua> in `FILES_TOOLSLIB`.
>
> >
> >  ifeq (,$(findstring Windows,$(OS)))
> > @@ -140,6 +144,7 @@ install: $(INSTALL_DEP)
>
> <snipped>
>
> > diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
> > index 1dfc39e4..a4adc15b 100644
> > --- a/tools/CMakeLists.txt
> > +++ b/tools/CMakeLists.txt
>
> <snipped>

===
diff --git a/Makefile.original b/Makefile.original
index 2a56d648..d0834fe6 100644
--- a/Makefile.original
+++ b/Makefile.original
@@ -98,9 +98,9 @@ FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \
 	      dis_arm64be.lua dis_ppc.lua dis_mips.lua dis_mipsel.lua \
 	      dis_mips64.lua dis_mips64el.lua vmdef.lua
 FILES_UTILSLIB= avl.lua bufread.lua symtab.lua
-FILES_MEMPROFLIB= parse.lua humanize.lua process.lua
+FILES_MEMPROFLIB= humanize.lua parse.lua process.lua
 FILES_SYSPROFLIB= parse.lua
-FILES_TOOLSLIB= memprof.lua
+FILES_TOOLSLIB= memprof.lua sysprof.lua

 ifeq (,$(findstring Windows,$(OS)))
   HOST_SYS:= $(shell uname -s)
===


More information about the Tarantool-patches mailing list