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 2366D5CD87; Mon, 25 Jan 2021 22:14:49 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2366D5CD87 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1611602089; bh=qrY2MmqQ9cUNoNIE4DP33YoaYKOr/vt1ZHq4Os18TTc=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=uG6XTkAzRjn2rfaV+OjVVPH4v9EFa9uL94UgEUkcd4FnVBGEhPa/hltCkcuhHEfEh J97YwQSWrVFG5p/lFItyRoecwRam14OUHOZmVAynlTGljW5VvsfBHFIW5CQbS2U1TC pmcwNtHG8TILmYbxn4WajgrBZ9zSpE5dBYsa492k= Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 6C4C87030E for ; Mon, 25 Jan 2021 22:14:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6C4C87030E Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1l47K1-0006fs-Uw; Mon, 25 Jan 2021 22:14:46 +0300 To: "Alexander V. Tikhonov" , Kirill Yukhin Date: Mon, 25 Jan 2021 22:14:41 +0300 Message-Id: X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD92BC6D7A73B5E1EC9C95833ED1B56E115E174DC50566391AE00894C459B0CD1B986AEA492B09D7DF2865C80D67608CDB601F8D1C32145D70404D8E79596628258 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE727FD6E7FC3A8F857EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637DA5CEC9EE7F170198638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FCCF9CA6B51300925E3FC161EC5A7B6F3D81C2DEC78AEF5B0B389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0A3E989B1926288338941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6957A4DEDD2346B42CC7F00164DA146DA6F5DAA56C3B73B23C77107234E2CFBA567F23339F89546C55F5C1EE8F4F765FC98F1C5DF904E309E75ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE4931B544F03EFBC4D576C9A9530EBF72002C4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F05F538519369F3743B503F486389A921A5CC5B56E945C8DA X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C4C7A0BC55FA0FE5FCCF9CA6B51300925E3FC161EC5A7B6F3DED35B374C1C4C694B1881A6453793CE9C32612AADDFBE0614847EA434AFE52629510FB958DCE06DB6ED91DBE5ABE359ADBCB5631A0A9D21F5E4DBAB5AF249FA793EDB24507CE13387DFF0A840B692CF8 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34BC3EEE75EF3BACCF49165B1961B03249003EC0BA066F84B8DDC8BB142329B515C885852DBBA10D4A1D7E09C32AA3244C58A45DF5F9C4280D753C8441D473B775E8FBBEFAE1C4874C927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbLwCnVtyrifwB0iPEPVf7A== X-Mailru-Sender: 689FA8AB762F73936BC43F508A06382257A276C4AB9C8792897A278079DE262DA7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 0/2] Update CMake minimum version in Tarantool 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 series contains auxiliary activities required for this issue[1]. The second and main patch updates Tarantool build infrastructure to use CMake 3.1 or newer. Since this CMake release[2] the vital for LuaJIT testing environment feature is introduced: one can use generator expressions[3] in target DEPENDS section. This CMake feature is used to pass either Tarantool binary or LuaJIT binary to the newly implemented testing machinery with no changes in it. Unfortunately, not all distributions provides CMake 3.1 or newer from their repositories. Here is the actual list of default packages providing CMake for the distributions that support Tarantool: | Distro | CMake version | Repo | |--------------------+---------------+---------------------| | CentOS 6 | 2.8.12 | base | | CentOS 7 | 2.8.12 | base | | CentOS 8 | 3.11.4 | appstream | | Debian Jessie | 3.0.2 | jessie/main | | Debian Stretch | 3.7.2 | stretch/main | | Debian Buster | 3.13.4 | buster/main | | Fedora 28 | 3.14.4 | updates | | Fedora 29 | 3.14.5 | updates | | Fedora 30 | 3.17.2 | updates | | Fedora 31 | 3.17.4 | updates | | Fedora 32 | 3.17.4 | updates | | FreeBSD 12 | 3.15.5 | default | | OSX 14 | 3.19.3 | brew | | OSX 15 | 3.19.3 | brew | | Ubuntu 14.04 | 2.8.12 | trusty/main | | Ubuntu 16.04 | 3.5.1 | xenial-updates/main | | Ubuntu 18.04 | 3.10.2 | bionic-updates/main | | Ubuntu 20.04 | 3.16.3 | focal/main | | openSUSE Leap 15.1 | 3.10.2 | Main | | openSUSE Leap 15.2 | 3.17.0 | Main | As one can see, there are no required packages provided by default for the following old distributions: CentOS 6, CentOS 7, Debian Jessie and Ubuntu 14.04. There are alternative packages (i.e. cmake3) providing a newer CMake than the default one for the old packages: | Distro | CMake3 version | Repo | |--------------------+-----------------+-------------------------| | CentOS 6 | 3.6.1 | epel* | | CentOS 7 | 3.17.5 | epel* | | Ubuntu 14.04 | 3.5.1 | trusty-updates/universe | (*) Unfortunately, I failed to find the way to make rpmbuild install and enable EPEL repository prior to the build step. However, cmake3 requirement obligues user to enable EPEL by himself, otherwise this dependency is left unmet. If there are any issues with building an RPM on CentOS 7 please proceed to the docs: https://www.tarantool.io/en/doc/latest/dev_guide/building_from_source/ So the last problem is Debian Jessie: the required CMake toolchain is provided neither via the default repository nor via the auxiliary one (e.g. updates like it's done for Ubuntu 14.04). Anyway, Debian Jessie long term support has reached its EOL[4], so we can freely drop this distribution from our regular building testing. This is done in the first patch of this series. NB: Be careful with updating CMake to 3.1 in CMakeLists. The following patch breaks Tarantool build. | diff --git a/CMakeLists.txt b/CMakeLists.txt | index 4fbd19558..6dc78fa88 100644 | --- a/CMakeLists.txt | +++ b/CMakeLists.txt | @@ -1,4 +1,4 @@ | -cmake_minimum_required(VERSION 2.8) | +cmake_minimum_required(VERSION 3.1) | | project(tarantool C CXX) | Surprisingly, as a result of this change -Wno-gnu-alignof-expression flag is removed from CFLAGS and the build fails on OSX with the following error[5]: | /tarantool/src/box/field_map.c:69:36: error: '_Alignof' applied to an expression is a GNU extension [-Werror,-Wgnu-alignof-expression] | region_aligned_alloc(region, sz, alignof(*extent)); | ^ | /Library/Developer/CommandLineTools/usr/lib/clang/12.0.0/include/stdalign.h:15:17: note: expanded from macro 'alignof' | #define alignof _Alignof | ^ | 1 error generated. Anyway, I believe this is out of the scope of this series, so I just leave this for the further CMake upgrade endeavors. Changes in v2: * Adjust the series in accordance with recently merged PRs moving all build jobs to GitHub CI[6], removing CentOS 6 CI pipeline[7] and introducing Fedora 33 build job to CI[8]. * Moved some parts of cover letter to commit messages. [1]: https://github.com/tarantool/tarantool/issues/4862 [2]: https://cmake.org/cmake/help/latest/release/3.1.html#commands [3]: https://cmake.org/cmake/help/v3.1/manual/cmake-generator-expressions.7.html [4]: https://www.debian.org/News/2020/20200709 [5]: https://gitlab.com/tarantool/tarantool/-/pipelines/243423841 [6]: https://github.com/tarantool/tarantool/pull/5724 [7]: https://github.com/tarantool/tarantool/pull/5729 [8]: https://github.com/tarantool/tarantool/pull/5707 Branch: https://github.com/tarantool/tarantool/tree/imun/cmake3-toolchain V1: https://lists.tarantool.org/tarantool-patches/20210120184230.GC5460@tarantool.org/T/#t Issue: https://github.com/tarantool/tarantool/issues/4862 CI is green but I can't share a single link to it after the changes in #5724, so please check whether there is a green tick everywhere for the top commit on the mentioned branch. @ChangeLog: | * Updated CMake minimum required version in Tarantool build | infrastructure to 3.1. Igor Munkin (2): github-ci: purge Debian Jessie from CI build: update CMake minimum version to 3.1 .github/workflows/debian_8.yml | 58 ---------------------------------- debian/control | 9 +++++- rpm/tarantool.spec | 30 ++++++++++++++++-- 3 files changed, 35 insertions(+), 62 deletions(-) delete mode 100644 .github/workflows/debian_8.yml -- 2.25.0