[Tarantool-patches] [PATCH] build: bump CMake minimum version for static build

Alexander V. Tikhonov avtikhon at tarantool.org
Fri Mar 12 19:15:07 MSK 2021


Hi Igor, thanks for the patch. I see it really fixed the issue, patch
LGTM.

On Fri, Mar 12, 2021 at 07:10:55PM +0300, Igor Munkin wrote:
> This patch follows up 54e149186348cd3f6e2e403cb48b15ae6c50f7aa
> ('build: update CMake minimum version to 3.1'). As a result of its
> cherry-pick CMake minimum version has not been updated within Docker
> machinery for the old static build pipeline.
> 
> The problem was disclosed by moving LuaJIT build system to CMake in
> scope of 5d25b860adbad11fa23d20381c9ad749c16ad856 ('build: adjust LuaJIT
> build system')
> 
> Follows up #4862
> 
> Signed-off-by: Igor Munkin <imun at tarantool.org>
> ---
> 
> Issue: https://github.com/tarantool/tarantool/issues/4862
> Branch: https://github.com/tarantool/tarantool/tree/imun/fix-cmake-for-static-build-1.10
> CI is green except the known problem with ASAN pipeline.
> 
> This patch need to be applied *only* to 1.10 branch.
> 
>  Dockerfile.staticbuild | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Dockerfile.staticbuild b/Dockerfile.staticbuild
> index f67f46f5e..c4fbb86fb 100644
> --- a/Dockerfile.staticbuild
> +++ b/Dockerfile.staticbuild
> @@ -23,7 +23,7 @@ RUN set -x \
>      && yum -y install \
>          perl \
>          gcc-c++ \
> -        cmake \
> +        cmake3 \
>          lz4-devel \
>          binutils-devel \
>          lua-devel \
> @@ -80,7 +80,7 @@ RUN set -x && \
>  RUN pip install -r /tarantool/test-run/requirements.txt
>  
>  RUN set -x && \
> -    cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
> +    cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
>           -DENABLE_DIST:BOOL=ON \
>           -DBUILD_STATIC=ON \
>           -DOPENSSL_USE_STATIC_LIBS=ON \
> -- 
> 2.25.0
> 


More information about the Tarantool-patches mailing list