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 8DA956F3C5; Fri, 12 Mar 2021 19:11:04 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8DA956F3C5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1615565464; bh=J4o2mLSuzzuVnmfOw+85vs0Qw3geZywwVbCVJ9rma8Q=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=r04mSYu07WWKkKeAABV19TmrHIZZENnoxjWdam18En6lYlhjVD5soSEf+yM66c/+4 69YSBGcUUqovnT48o/vfMYP/VuBCE6Ii0b7Wg68FOE70AAmLPLJPCMNZ9dgUcsNo4H OdNsXFOcpLQ8davfC4ut2/bKfhBRN6I1XsiJR6tk= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 D75916F3C5 for ; Fri, 12 Mar 2021 19:11:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D75916F3C5 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1lKkNR-0007qz-CQ; Fri, 12 Mar 2021 19:11:01 +0300 To: "Alexander V. Tikhonov" , Kirill Yukhin Date: Fri, 12 Mar 2021 19:10:55 +0300 Message-Id: <537149b963da8dec28624b92a684e3e21a5bb4e1.1615565228.git.imun@tarantool.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D3134714A9BDB69B63430D3F1B4C5913A95494451A5CA18200894C459B0CD1B979DAF37FDB4911257DD36303A14E9F40128C5D8D02436B959C45B5B3EE0679D2 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F5F08398AF01CA1FEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063725D748B084CAA27D8638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95C11F5982A89E0728C394D97B03EE873F4D5F82CC63E56841DA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE709B92020B71E24959FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C390D92131081DE748117882F4460429728AD0CFFFB425014E868A13BD56FB6657A7F4EDE966BC389F9E8FC8737B5C22490E26A56DB46E81E4089D37D7C0E48F6CCF19DD082D7633A0E7DDDDC251EA7DABAAAE862A0553A39223F8577A6DFFEA7CB3E4D57BB3B05F1143847C11F186F3C5E7DDDDC251EA7DABCC89B49CDF41148FA8EF81845B15A4842623479134186CDE6BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C11F5982A89E0728C394D97B03EE873F4D5F82CC63E56841D9C2B6934AE262D3EE7EAB7254005DCED0149FEE6F00FA2431E0A4E2319210D9B64D260DF9561598F01A9E91200F654B02DA3D96DA0CEF5C48E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34FACF503ACC83041B7B78A779BD12DDFB6A8313F7AC0F1431EC613D26A168B9F1429F49A42B71D9E81D7E09C32AA3244CDBC094703C049C65D293EBBE3A1CAB023FD9C8CA1B0515E0927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojQNwI24iyQ+p7cM1UbugTWQ== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822DE0F8056C987FF0B72D8473F6B799715A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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