From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 101AB6F3C5; Fri, 12 Mar 2021 19:15:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 101AB6F3C5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1615565711; bh=cTC397Jl8Yh/tn78699JsppV7j/Vi8UrJDWsAWhIys8=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=VY8i65CTIw5ZynQmweT++UMdXH5W8+XIrpKF4P6yxRs+1i69/37A/c4wnf2rzkyWI xnSO2kFu0xDbhFS28GZPbokczBvlm9EjbYXGSfiwyQnXbAcAd95j9+BnhE9vKYvvpH LBYJ+cWDCiUzgWQmASXwK37+YKbau9NqtShNkjMY= Received: from smtp16.mail.ru (smtp16.mail.ru [94.100.176.153]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id D36E16F3C5 for ; Fri, 12 Mar 2021 19:15:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D36E16F3C5 Received: by smtp16.mail.ru with esmtpa (envelope-from ) id 1lKkRR-0002Ve-3J; Fri, 12 Mar 2021 19:15:09 +0300 Date: Fri, 12 Mar 2021 19:15:07 +0300 To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Message-ID: <20210312161507.GA44737@hpalx> References: <537149b963da8dec28624b92a684e3e21a5bb4e1.1615565228.git.imun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <537149b963da8dec28624b92a684e3e21a5bb4e1.1615565228.git.imun@tarantool.org> X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9D3134714A9BDB69BC7A690B93B93DD09EFED8A8D520004C100894C459B0CD1B9DA8C3C21DAB0D578C9F2E8938F03A72E128C5D8D02436B951DFC3049464E9EA7 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7CB5C87C4C9A74E8BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637D07BBD2EBFB7BF888638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C11F5982A89E0728C1DA338E5B7B458417EE97400EF43CDEEA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE74A95F4E53E8DCE969FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C390D92131081DE748117882F4460429728AD0CFFFB425014E868A13BD56FB6657A7F4EDE966BC389F9E8FC8737B5C224936A9FA71ECE66835089D37D7C0E48F6CCF19DD082D7633A0E7DDDDC251EA7DABAAAE862A0553A3920E30A4C9C8E338DA74F8CD32ECFF047543847C11F186F3C5E7DDDDC251EA7DABCC89B49CDF41148FA8EF81845B15A4842623479134186CDE6BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: 2623F767319EFA42AC98609FCEE262F9192335DD689A58EBAE0174B7F1092AFB772CA28438279D92712118BB8F63B2D6 X-C1DE0DAB: 0D63561A33F958A57DBF8CAB674FF1441AD44941CAD761A9F503A7C7093F3219D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75F04B387B5D7535DE410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34ECB3E21D3CD9CB4F7C27CEF565DC57E37AA121219CCA3BE333E6B430D6567BF0017E46B3CE6BAFC01D7E09C32AA3244C51E0BB51340D47307E3B5F68AA5D78DFB4DF56057A86259F729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojQNwI24iyQ+qp0HFC4khc5g== X-Mailru-Sender: 3B9A0136629DC91203FBB98BB0AC256E8E08E0DD985FDE5EA812E4FE077933F8C15667D5CFEC4B13C6BE15A09D9B9DC7F25921C611F62F88B76B9718D0A84D677D8D5F77027693F59437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH] build: bump CMake minimum version for static build X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: "Alexander V. Tikhonov via Tarantool-patches" Reply-To: "Alexander V. Tikhonov" Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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 > --- > > 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 >