From f426b1dee2591bf318f38e776472377fb16803b0 Mon Sep 17 00:00:00 2001
From: Sergey Bronnikov <sergeyb@tarantool.org>
Date: Mon, 16 Jan 2023 11:55:28 +0300
Subject: [PATCH] debian: bump cmake version
Curl 7.87 uses CMake's keywords (for example GREATER_EQUAL [0])
available since CMake 3.7. However, we are still supporting old Ubuntu
version where CMake version lower than 3.7 is used. This patch adds a
script that enables CMake repository with newer CMake packages for
Ubuntu 16.04 (Xenial) and bumps a required version of CMake.
NOTE (regarding cmake3 package):
Commit 1a62d874db5f ("build: update CMake minimum version to 3.1") [1]
added an additional package requirement with "cmake3". This package has
been created in addition to package "cmake", because CMake 3 had
breaking changes [2]. Package "cmake3" has been provided only in Ubuntu
14.04 LTS (Trusty Tahr) [4], that will be EOLed in 2024, and CentOS 7,
that was EOLed in Aug 2020 and will have end of security support in Jun
2024 [5]. Latest version of package "cmake3" for Ubuntu 14.04 is 3.5.1
[3], so it is not worth to bump version of cmake3 in requirements and I
left it the same.
0. https://cmake.org/cmake/help/latest/command/if.html#greater-equal
1. https://github.com/tarantool/tarantool/commit/1a62d874db5f4780da5b35b6d4d0e3a296148920
2. https://cmake.org/cmake/help/latest/release/3.0.html#id4
3. https://launchpad.net/ubuntu/trusty/+package/cmake3
4. https://ubuntu.com/about/release-cycle
5. https://wiki.centos.org/About/Product
Needed for #8150
NO_CHANGELOG=see the next commit
NO_DOC=libcurl submodule bump
NO_TEST=libcurl submodule bump
(cherry picked from commit 7003272ddd735d47e418c31d3f6ef0def8417524)
---
debian/control | 2 +-
debian/prebuild.sh | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100755 debian/prebuild.sh
diff --git a/debian/control b/debian/control
index e442c8ccb9..5b9146a8ab 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: cdbs (>= 0.4.100), debhelper (>= 9), dpkg-dev (>= 1.16.1~),
# make package manager seek for cmake3 package at first and use it
# if found or fallback to cmake package (that provides CMake 3+
# for modern distributions) otherwise.
- cmake3 (>= 3.3) | cmake (>= 3.3),
+ cmake3 (>= 3.3) | cmake (>= 3.7),
libreadline-dev,
libncurses5-dev,
libssl-dev,
diff --git a/debian/prebuild.sh b/debian/prebuild.sh
new file mode 100755
index 0000000000..03b61badcb
--- /dev/null
+++ b/debian/prebuild.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -exu
+
+# Ubuntu Xenial has a CMake version that doesn't support
+# keywords used in curl's CMake.
+if [[ $DIST == "xenial" ]]; then
+ wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
+ echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ xenial main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
+ sudo apt-get update
+fi
--
GitLab