From 1dd0ac479bf660a3624b6ab4b313359430c155d6 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 28 Mar 2025 07:43:00 +0000 Subject: [PATCH 1/2] mariadb: allow build with cmake-4.0.0 patch is for https://github.com/codership/wsrep-lib - 246 --- .../mariadb-246-build-with-cmake-4.0.0.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/addons/service/mariadb/patches/mariadb-246-build-with-cmake-4.0.0.patch diff --git a/packages/addons/service/mariadb/patches/mariadb-246-build-with-cmake-4.0.0.patch b/packages/addons/service/mariadb/patches/mariadb-246-build-with-cmake-4.0.0.patch new file mode 100644 index 0000000000..0ce3498129 --- /dev/null +++ b/packages/addons/service/mariadb/patches/mariadb-246-build-with-cmake-4.0.0.patch @@ -0,0 +1,22 @@ +From 2abb5e794fdaf6114d4691f7921ec7bda2902603 Mon Sep 17 00:00:00 2001 +From: fundawang +Date: Sat, 22 Mar 2025 23:08:46 +0800 +Subject: [PATCH] Update cmake minimum version range + +--- + wsrep-lib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wsrep-lib/CMakeLists.txt b/wsrep-lib/CMakeLists.txt +index ef2f4c8b..b6dd69f1 100644 +--- a/wsrep-lib/CMakeLists.txt ++++ b/wsrep-lib/CMakeLists.txt +@@ -2,7 +2,7 @@ + # Copyright (C) 2021 Codership Oy + # + +-cmake_minimum_required (VERSION 2.8) ++cmake_minimum_required (VERSION 2.8...4.0) + + # Parse version from version header file and store it into + # WSREP_LIB_VERSION. From 34d34fbdc8a143bea69718c2595893b72abd2c51 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 27 Mar 2025 20:56:14 +0000 Subject: [PATCH 2/2] cmake: update to 4.0.1 Release notes: - https://cmake.org/cmake/help/latest/release/index.html --- packages/devel/cmake/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/cmake/package.mk b/packages/devel/cmake/package.mk index 10b038279b..c03f2af32c 100644 --- a/packages/devel/cmake/package.mk +++ b/packages/devel/cmake/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="cmake" -PKG_VERSION="3.31.6" -PKG_SHA256="653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0" +PKG_VERSION="4.0.1" +PKG_SHA256="d630a7e00e63e520b25259f83d425ef783b4661bdc8f47e21c7f23f3780a21e1" PKG_LICENSE="BSD" PKG_SITE="https://cmake.org/" PKG_URL="https://cmake.org/files/v$(get_pkg_version_maj_min)/cmake-${PKG_VERSION}.tar.gz"