<div dir="ltr">Hello, thank you very much for new iteration of the review!<br><br>Typos are fixed.<br><br>Here is a diff:<br><br>diff --git a/static-build/CMakeLists.txt b/static-build/CMakeLists.txt<br>index 90029fdd8..9a2f85052 100644<br>--- a/static-build/CMakeLists.txt<br>+++ b/static-build/CMakeLists.txt<br>@@ -1,8 +1,8 @@<br> cmake_minimum_required(VERSION 2.8)<br> <br>-# Detect system compilers for further configuring dependencies to be<br>-# builded with these compilers. This is used to build tarantool and<br>-# it's dependencies by usign one compiler system (for example libicu<br>+# Detect system compilers for further dependencies configuring to be<br>+# built with these compilers. This is used to build tarantool and<br>+# it's dependencies by using one compiler system (for example libicu<br> # by default uses clang if it exists when others uses gcc/g++ on<br> # linux machine).<br> project(tarantool-static C CXX)<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">пн, 14 сент. 2020 г. в 19:43, Igor Munkin <<a href="mailto:imun@tarantool.org">imun@tarantool.org</a>>:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello,<br>
<br>
Thanks, the patch is LGTM, except the nits below.<br>
<br>
Minor: Do we need a ChangeLog entry for it? I don't know.<br>
<br>
On 09.09.20, HustonMmmavr wrote:<br>
> From: Yaroslav Dynnikov <<a href="mailto:yaroslav.dynnikov@gmail.com" target="_blank">yaroslav.dynnikov@gmail.com</a>><br>
> <br>
> Refactored static build process to use static-build/CMakeLists.txt<br>
> instead of Dockerfile.staticbuild (this allows to support static<br>
> build on macOS). Following third-party dependencies for static build<br>
> are installed via cmake `ExternalProject_Add`:<br>
> - OpenSSL<br>
> - Zlib<br>
> - Ncurses<br>
> - Readline<br>
> - Unwind<br>
> - ICU<br>
> <br>
> * Added support static build for macOS<br>
> * Fixed `CONFIGURE_COMMAND` while building bundled libcurl for static<br>
> build at file cmake/BuildLibCURL.cmake:<br>
> - disable building shared libcurl libraries (by setting<br>
> `--disable-shared` option)<br>
> - disable hiding libcurl symbols (by setting<br>
> `--disable-symbol-hiding` option)<br>
> - prevent linking libcurl with system libz (by setting<br>
> `--with-zlib=${FOUND_ZLIB_ROOT_DIR}` option)<br>
> * Removed Dockerfile.staticbuild<br>
> * Added new <a href="http://gitlab.ci" rel="noreferrer" target="_blank">gitlab.ci</a> jobs to test new style static build:<br>
> - static_build_cmake_linux<br>
> - static_build_cmake_osx_15<br>
> * Removed static_docker_build <a href="http://gitlab.ci" rel="noreferrer" target="_blank">gitlab.ci</a> job<br>
> <br>
> Closes #5095<br>
> ---<br>
> <br>
> Branch: <a href="https://github.com/tarantool/tarantool/tree/rosik/refactor-static-build" rel="noreferrer" target="_blank">https://github.com/tarantool/tarantool/tree/rosik/refactor-static-build</a><br>
> Issue: <a href="https://github.com/tarantool/tarantool/issues/5095" rel="noreferrer" target="_blank">https://github.com/tarantool/tarantool/issues/5095</a><br>
> <br>
> Changes in v3:<br>
> 1. Fixed typos at commit message<br>
> 2. Fixed commentaries at .<a href="http://travis.mk" rel="noreferrer" target="_blank">travis.mk</a><br>
> 3. Fixed finding libz library at cmake/BuildLibCurl.cmake as at master<br>
> branch<br>
> 4. Instead of using static-build/.gitignore use the root .gitignore file<br>
> 5. Refactored static-build/CMakeLists.txt:<br>
> * Project name is set to tarantool-static<br>
> * Instead of explicitly finding of c/c++ compilers current version uses<br>
> cmake `project(tarantool-static C CXX)` command. This change requires<br>
> to manually set CFLAGS/CPPFLAGS/LDFLAGS for all static-build<br>
> dependencies (because building dependencies at macOS requires path<br>
> to macOS SDK) the idea was taken from cmake/BuildLibCurl.cmake<br>
> * Added commentaries about problem with libicu<br>
> * Removed unused TEST_COMMAND at ExternalProject_Add(zlib ...) also<br>
> removed unnecessary # STEP_TARGETS at ExternalProject_Add(readline ...)<br>
> * Deleted doubled whitespaces<br>
> 6. Fixed static-build/README.md:<br>
> * Added list of required tools<br>
> * Added example for ubuntu/debian<br>
> * Fixed indentation and typos<br>
> 7. Refactored tests:<br>
> * Got rid of test-run<br>
> * Deleted doubled whitespaces at exports.test.lua<br>
> * Fixed defining of RTLD_DEFAULT<br>
> <br>
> <br>
> .gitignore | 8 +<br>
> .gitlab-ci.yml | 11 +-<br>
> .<a href="http://travis.mk" rel="noreferrer" target="_blank">travis.mk</a> | 56 +++-<br>
> Dockerfile.staticbuild | 98 ------<br>
> cmake/BuildLibCURL.cmake | 13 +-<br>
> cmake/compiler.cmake | 24 +-<br>
> cmake/os.cmake | 5 +-<br>
> static-build/CMakeLists.txt | 311 ++++++++++++++++++<br>
> static-build/README.md | 90 +++++<br>
> static-build/test/CheckDependencies.cmake | 43 +++<br>
> .../test/static-build/exports.test.lua | 142 ++++++++<br>
> .../test/static-build/traceback.test.lua | 15 +<br>
> 12 files changed, 692 insertions(+), 124 deletions(-)<br>
> delete mode 100644 Dockerfile.staticbuild<br>
> create mode 100644 static-build/CMakeLists.txt<br>
> create mode 100644 static-build/README.md<br>
> create mode 100644 static-build/test/CheckDependencies.cmake<br>
> create mode 100755 static-build/test/static-build/exports.test.lua<br>
> create mode 100755 static-build/test/static-build/traceback.test.lua<br>
> <br>
<br>
<snipped><br>
<br>
> diff --git a/static-build/CMakeLists.txt b/static-build/CMakeLists.txt<br>
> new file mode 100644<br>
> index 000000000..90029fdd8<br>
> --- /dev/null<br>
> +++ b/static-build/CMakeLists.txt<br>
> @@ -0,0 +1,311 @@<br>
> +cmake_minimum_required(VERSION 2.8)<br>
> +<br>
> +# Detect system compilers for further configuring dependencies to be<br>
<br>
Typo: s/configuring dependencies/dependencies configuring/.<br>
<br>
> +# builded with these compilers. This is used to build tarantool and<br>
<br>
Typo: s/builded/built/.<br>
<br>
> +# it's dependencies by usign one compiler system (for example libicu<br>
<br>
Typo: s/usign/using/.<br>
<br>
> +# by default uses clang if it exists when others uses gcc/g++ on<br>
> +# linux machine).<br>
<br>
<snipped><br>
<br>
> -- <br>
> 2.26.2<br>
> <br>
<br>
-- <br>
Best regards,<br>
IM<br>
</blockquote></div>