From: Igor Munkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Alexander Turenko <alexander.turenko@tarantool.org>, "Alexander V. Tikhonov" <avtikhon@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH 2/2] build: update CMake minimal version to 3.1 Date: Thu, 21 Jan 2021 03:48:45 +0300 [thread overview] Message-ID: <20210121004845.GD5460@tarantool.org> (raw) In-Reply-To: <4cb3d48dc4640e7e2c73da66dc1e4586a4f76e02.1611149713.git.imun@tarantool.org> 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: <snipped> > diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec > index aae60f8dc..4167ca480 100644 > --- a/rpm/tarantool.spec > +++ b/rpm/tarantool.spec <snipped> > @@ -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
next prev parent reply other threads:[~2021-01-21 0:48 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-20 18:19 [Tarantool-patches] [PATCH 0/2] Update CMake minimal version in Tarantool Igor Munkin via Tarantool-patches 2021-01-20 18:19 ` [Tarantool-patches] [PATCH 1/2] gitlab-ci: purge Debian Jessie from CI Igor Munkin via Tarantool-patches 2021-01-20 18:19 ` [Tarantool-patches] [PATCH 2/2] build: update CMake minimal version to 3.1 Igor Munkin via Tarantool-patches 2021-01-21 0:48 ` Igor Munkin via Tarantool-patches [this message] 2021-01-20 18:42 ` [Tarantool-patches] [PATCH 0/2] Update CMake minimal version in Tarantool Igor Munkin via Tarantool-patches 2021-01-25 19: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=20210121004845.GD5460@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=avtikhon@tarantool.org \ --cc=imun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 2/2] build: update CMake minimal version to 3.1' \ /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