From: Igor Munkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: "Alexander V. Tikhonov" <avtikhon@tarantool.org>, Kirill Yukhin <kyukhin@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH] build: bump CMake minimum version for static build Date: Fri, 12 Mar 2021 19:10:55 +0300 [thread overview] Message-ID: <537149b963da8dec28624b92a684e3e21a5bb4e1.1615565228.git.imun@tarantool.org> (raw) 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@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
next reply other threads:[~2021-03-12 16:11 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-12 16:10 Igor Munkin via Tarantool-patches [this message] 2021-03-12 16:15 ` Alexander V. Tikhonov via Tarantool-patches 2021-03-15 15:32 ` Igor Munkin via Tarantool-patches 2021-03-16 11:46 ` Kirill Yukhin via Tarantool-patches 2021-03-16 12:18 ` Igor Munkin via Tarantool-patches 2021-03-16 12:21 ` Igor Munkin via Tarantool-patches
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=537149b963da8dec28624b92a684e3e21a5bb4e1.1615565228.git.imun@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=avtikhon@tarantool.org \ --cc=imun@tarantool.org \ --cc=kyukhin@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH] build: bump CMake minimum version for static build' \ /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