mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-08-25 05:21:31 +00:00
Code Issues Projects Releases Wiki Activity

suitesparse: fix CMake 4 configure failure

Browse Source 
SuiteSparse 5.10.1 still carries bundled CMake entry points with
2.x minimum versions. CMake 4 rejects projects which request
compatibility with versions older than 3.5, so configure fails before
SuiteSparse can build.

Backport the upstream SuiteSparse change which raises the bundled
Mongoose, METIS and GKlib minimum version to 3.13. This version also
reaches two bundled GraphBLAS CMake entry points with the same old
minimum, so update those in the backport as well.

Signed-off-by: Himanshu Jadon <hjadon@cisco.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Himanshu Jadon
2026-08-20 06:03:57 -07:00
committed by Khem Raj
parent ee1c39e595
commit de2fc817a4
2 changed files with 87 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/suitesparse/suitesparse/0004-Allow-build-with-CMake-4.patch
+86
View File
@@ -0,0 +1,86 @@
From 57e1fd1a4bf7878136a9f5070dadb310f233f489 Mon Sep 17 00:00:00 2001
From: Tim Davis <DrTimothyAldenDavis@gmail.com>
Date: Wed, 9 Mar 2022 10:33:33 -0600
Subject: [PATCH] require cmake 3.13
Upstream-Status: Backport [https://github.com/DrTimothyAldenDavis/SuiteSparse/commit/ae0be0028e68d429feb565f093aec875235447cc]
Backport-Changes:
* Also update the two bundled GraphBLAS CMake entry points reached by
the SuiteSparse 5.10.1 build.
* Preserve the METIS_VERSION value supplied by the existing OE patch
after CMake policy CMP0048 becomes NEW.
(cherry picked from commit ae0be0028e68d429feb565f093aec875235447cc)
Signed-off-by: Deepak Rathore <deeratho@cisco.com>
---
GraphBLAS/CMakeLists.txt | 2 +-
GraphBLAS/GraphBLAS/CMakeLists.txt | 2 +-
Mongoose/CMakeLists.txt | 2 +-
metis-5.1.0/CMakeLists.txt | 2 +-
metis-5.1.0/GKlib/CMakeLists.txt | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/GraphBLAS/CMakeLists.txt b/GraphBLAS/CMakeLists.txt
index 7eb999189..eecfa0ac5 100644
--- a/GraphBLAS/CMakeLists.txt
+++ b/GraphBLAS/CMakeLists.txt
@@ -12,7 +12,7 @@
#-------------------------------------------------------------------------------
# cmake 3.13 is preferred.
-cmake_minimum_required ( VERSION 2.8.12 )
+cmake_minimum_required ( VERSION 3.13 )
message ( STATUS "CMake version: " ${CMAKE_VERSION} )
diff --git a/GraphBLAS/GraphBLAS/CMakeLists.txt b/GraphBLAS/GraphBLAS/CMakeLists.txt
index f365251db..26928dc0a 100644
--- a/GraphBLAS/GraphBLAS/CMakeLists.txt
+++ b/GraphBLAS/GraphBLAS/CMakeLists.txt
@@ -17,7 +17,7 @@
#-------------------------------------------------------------------------------
# cmake 3.13 is preferred.
-cmake_minimum_required ( VERSION 2.8.12 )
+cmake_minimum_required ( VERSION 3.13 )
message ( STATUS "CMake version: " ${CMAKE_VERSION} )
diff --git a/Mongoose/CMakeLists.txt b/Mongoose/CMakeLists.txt
index 91a7f70ef..361fa1239 100644
--- a/Mongoose/CMakeLists.txt
+++ b/Mongoose/CMakeLists.txt
@@ -20,7 +20,7 @@
#
# make distclean
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.13)
include(CMake/cmake_colors.cmake)
if (POLICY CMP0048)
diff --git a/metis-5.1.0/CMakeLists.txt b/metis-5.1.0/CMakeLists.txt
index 318019bfc..1a72ed0d0 100644
--- a/metis-5.1.0/CMakeLists.txt
+++ b/metis-5.1.0/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 2.8)
-project(METIS)
+cmake_minimum_required(VERSION 3.13)
+project(METIS VERSION ${METIS_VERSION})
set(GKLIB_PATH "GKlib" CACHE PATH "path to GKlib")
set(SHARED FALSE CACHE BOOL "build a shared library")
diff --git a/metis-5.1.0/GKlib/CMakeLists.txt b/metis-5.1.0/GKlib/CMakeLists.txt
index 67b600aa6..2f4ae75d7 100644
--- a/metis-5.1.0/GKlib/CMakeLists.txt
+++ b/metis-5.1.0/GKlib/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.13)
project(GKlib)
get_filename_component(abs "." ABSOLUTE)
--
2.35.6
meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb
+1
View File
@@ -5,6 +5,7 @@ SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https;branc
file://0002-Preserve-links-when-installing-libmetis.patch \
file://0003-Add-version-information-to-libmetis.patch \
file://makefile-quoting.patch \
file://0004-Allow-build-with-CMake-4.patch \
"
SRCREV = "538273cfd53720a10e34a3d80d3779b607e1ac26"