From 6f50b12c17dbcb823436d6fc85a1334b018d8e57 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Sat, 22 Nov 2025 23:14:31 +0800 Subject: [PATCH] fix build with cmake 4 (cherry picked from commit 42d1acdfd570224f26d9df1a7460e8dfaa351f64) --- greatsql-8.4.4-4-port-to-cmake4.patch | 16 ++++++++++++++++ greatsql.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 greatsql-8.4.4-4-port-to-cmake4.patch diff --git a/greatsql-8.4.4-4-port-to-cmake4.patch b/greatsql-8.4.4-4-port-to-cmake4.patch new file mode 100644 index 0000000..879afa6 --- /dev/null +++ b/greatsql-8.4.4-4-port-to-cmake4.patch @@ -0,0 +1,16 @@ +--- greatsql-8.4.4-4/extra/coredumper/CMakeLists.txt.orig 2025-11-22 23:11:13.476413700 +0800 ++++ greatsql-8.4.4-4/extra/coredumper/CMakeLists.txt 2025-11-22 23:11:25.814268800 +0800 +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 2.8.12...${CMAKE_VERSION}) + if (POLICY CMP0048) + cmake_policy(SET CMP0048 NEW) + endif(POLICY CMP0048) +--- greatsql-8.4.4-4/extra/protobuf/protobuf-24.4/third_party/utf8_range/CMakeLists.txt.orig 2025-11-22 23:11:40.415598100 +0800 ++++ greatsql-8.4.4-4/extra/protobuf/protobuf-24.4/third_party/utf8_range/CMakeLists.txt 2025-11-22 23:11:53.572134400 +0800 +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.5) ++cmake_minimum_required (VERSION 3.5...${CMAKE_VERSION}) + project (utf8_range C CXX) + + # option() honor variables diff --git a/greatsql.spec b/greatsql.spec index 0931f63..3d33b71 100644 --- a/greatsql.spec +++ b/greatsql.spec @@ -31,7 +31,7 @@ %global mysql_version 8.4.4 %global greatsql_version 4 %global revision d73de75905d -%global rpm_release 2 +%global rpm_release 3 %global release %{greatsql_version}.%{rpm_release}%{?dist} @@ -102,6 +102,7 @@ SOURCE10: https://archives.boost.io/release/1.77.0/source/boost_1_77_0.tar SOURCE11: mysqld.cnf SOURCE12: mysql_config.sh Patch0: mysql-5.7-sharedlib-rename.patch +Patch1: greatsql-8.4.4-4-port-to-cmake4.patch BuildRequires: cmake >= 3.6.1 BuildRequires: make BuildRequires: gcc @@ -386,6 +387,7 @@ For a description of GreatSQL see https://greatsql.cn %setup -q -T -a 0 -c -n %{src_dir} pushd %{src_dir} %patch -P0 -p1 +%patch -P1 -p1 #%patch -P0 -p0 #%patch -P1 -p1 cp %{SOURCE11} scripts @@ -1213,6 +1215,9 @@ fi %{_libdir}/mysql/private/icudt73l/brkitr %changelog +* Sat Nov 22 2025 Funda Wang - 8.4.4-4.3 +- fix build with cmake 4 + * Fri Oct 24 2025 GreatSQL - 8.4.4-4.2 - New BuildRequires:libatomic - Delete redundant %rhel definitions -- Gitee