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 25E8E5CD87; Thu, 21 Jan 2021 03:48:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 25E8E5CD87 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1611190130; bh=DE3h3uxjdK07gszanrFr5oZsyboYjbxGBn+ZgdVkLnw=; 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=T1wYVbkHLgSSKwk20L79ImouqRsCWLxC1VwSKHnjGn6q2XT6aStJYaP/qTVBxex6d 0ABC0YYmIRGnnMzcEu8OVl+kig+h/frcpzBkeIioEP4No8rx8WWuS3tXxGAzjMaQa2 q1QGo3cp4xRaPxvo6w3pIbjqZbWPM8vlh8Dug6jE= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 F2019645E6 for ; Thu, 21 Jan 2021 03:48:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F2019645E6 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1l2O9X-0005me-MF; Thu, 21 Jan 2021 03:48:48 +0300 Date: Thu, 21 Jan 2021 03:48:45 +0300 To: Alexander Turenko , "Alexander V. Tikhonov" Cc: tarantool-patches@dev.tarantool.org Message-ID: <20210121004845.GD5460@tarantool.org> References: <4cb3d48dc4640e7e2c73da66dc1e4586a4f76e02.1611149713.git.imun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <4cb3d48dc4640e7e2c73da66dc1e4586a4f76e02.1611149713.git.imun@tarantool.org> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.10.1 (2018-07-13) X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD9D0E79FBC973162CDC332107C56D78A30EABAEB9DEE13ADFC00894C459B0CD1B9ABFBE8A9CAA34A405C86759ADC4B31A11788399064187E8199950209BA47E511 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73870E1FF9A049D91EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006377A7A7D315BEE81B48638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FC4C7A45056FCD5E4DA25EE2CF879D674E8340628A3B69755E389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C07E7E81EEA8A9722B8941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6D082881546D93491CC7F00164DA146DA6F5DAA56C3B73B23C77107234E2CFBA567F23339F89546C55F5C1EE8F4F765FCFF4145385FF5C95075ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE4931B544F03EFBC4D576D8C47C27EEC5E9FB5C8C57E37DE458B4C7702A67D5C3316FA3894348FB808DB48C21F01D89DB561574AF45C6390F7469DAA53EE0834AAEE X-C1DE0DAB: 0D63561A33F958A5C7AA8BB7CBED46A2AEFA265CB9EBFBB68CCEE8007AFF7707D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA758F9E841AEAEC4F2C410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34ECB3E21D3CD9CB4F2EEDFFB89840871C0C19150D1EB5C5734C0090698E0A615117653F1E56BA40E01D7E09C32AA3244C569B2FE68763C338FAB0BFBCEDCA716835DA7DC5AF9B58C0927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj7AvRt3Uvx5Rmd3UDJOE1Ug== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822D8A5E852A421D0EB2FE9EAF06EB21300A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH 2/2] build: update CMake minimal version to 3.1 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 Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" I faced another strangle behaviour in rpmbuild. I rebased my WIP branch with the new LuaJIT testing machinery on this series and the build failed[1]. After the fix below both CI are fine: this series[2] and LuaJIT testing machinery WIP branch[3] (except the known problem with ASAN job). On 20.01.21, Igor Munkin wrote: > diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec > index aae60f8dc..4167ca480 100644 > --- a/rpm/tarantool.spec > +++ b/rpm/tarantool.spec > @@ -115,7 +135,7 @@ Requires: openssl > # RHEL <= 7 doesn't support Recommends: > Recommends: tarantool-devel > Recommends: git-core > -Recommends: cmake >= 2.8 > +Recommends: cmake >= 3.1 > Recommends: make > Recommends: gcc >= 4.5 > Recommends: gcc-c++ >= 4.5 > @@ -147,7 +167,14 @@ C and Lua/C modules. > > %build > # RHBZ #1301720: SYSCONFDIR an LOCALSTATEDIR must be specified explicitly > -%cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ > +# XXX: KISS, please. I can play with RPM macros to redefine %cmake > +# macro for cmake3 usage, but it totally doesn't worth it. If there is %cmake in *comment* then the branching below is ignored (I guess) and the build is broken since the old CMake is used. Well, I can state nothing with certainty, but if I remove % sign everything works. This is ridiculous. Here is the iterative fix: ================================================================================ diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index 9774dca..f1ad949 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -168,7 +168,7 @@ C and Lua/C modules. %build # RHBZ #1301720: SYSCONFDIR an LOCALSTATEDIR must be specified explicitly -# XXX: KISS, please. I can play with RPM macros to redefine %cmake +# XXX: KISS, please. I can play with RPM macros to redefine cmake # macro for cmake3 usage, but it totally doesn't worth it. %if %use_cmake3 %cmake3 \ ================================================================================ Fixed, squashed, force pushed to the remote branches. > +%if %use_cmake3 > +%cmake3 \ > +%else > +%cmake \ > +%endif > + . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ > -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=%{_localstatedir} \ > -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \ > %if %{with backtrace} > -- > 2.25.0 > [1]: https://gitlab.com/tarantool/tarantool/-/pipelines/244558416 [2]: https://gitlab.com/tarantool/tarantool/-/pipelines/244656467 [3]: https://gitlab.com/tarantool/tarantool/-/pipelines/244657524 -- Best regards, IM