[Tarantool-patches] [PATCH v1] Enable curl build with old cmake
Alexander Turenko
alexander.turenko at tarantool.org
Sat Jul 11 01:03:35 MSK 2020
On Mon, Jul 06, 2020 at 12:56:23PM +0300, Alexander V. Tikhonov wrote:
> Blocked check if the current cmake of the older than
> 3.2...3.16 version to be able to build curl at the old OS:
> - CentOS 6
> - CentOS 7
> - Debian 8
> - Ubuntu 14.04
>
> Needed for tarantool/tarantool#4968
> ---
>
> Github: https://github.com/tarantool/curl/tree/avtikhon/curl-7_71_1
> Issue: https://github.com/tarantool/tarantool/issues/4968
>
> CMakeLists.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 5a1333397..7a0b12ebf 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -37,7 +37,7 @@
> # To check:
> # (From Daniel Stenberg) The cmake build selected to run gcc with -fPIC on my box while the plain configure script did not.
> # (From Daniel Stenberg) The gcc command line use neither -g nor any -O options. As a developer, I also treasure our configure scripts's --enable-debug option that sets a long range of "picky" compiler options.
> -cmake_minimum_required(VERSION 3.2...3.16 FATAL_ERROR)
> +#cmake_minimum_required(VERSION 3.2...3.16 FATAL_ERROR)
>
> set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
> include(Utilities)
> --
> 2.17.1
>
I don't have objections against the idea to relax CMake version
requirement if everything actually works as expected on all platforms we
support.
Regarding maintaining an our own patchset upward an upstream repository.
I think it should follow the same process as we defined for luarocks:
see the comment [1].
So I pushed the patch to the branch `curl-7_71_1-tarantool`. Please,
take it as the long-term branch: no force-pushes and push after review.
When we'll move to CMake for curl submodule building, we'll update the
submodule to the last commit of this branch.
Please, don't mix it with updating to curl-7.71.1 (#4698) and update the
submodule to the tag `curl-7_71_1` within scope of #4698 (not to the
`curl-7_71_1-tarantool` branch). This way the updates will be more
fine-grained, which is good property.
[1]: https://github.com/tarantool/tarantool/pull/4207#issuecomment-499997567
WBR, Alexander Turenko.
More information about the Tarantool-patches
mailing list