PR#2: Add Python 3.13 to cmake config - rpms/rmol

rpms / rmol

#2 Add Python 3.13 to cmake config

Merged 6 months ago by denisarnaud. Opened 6 months ago by ksurma.

rpms/ ksurma/rmol cmake into rawhide

Add Python 3.13 to cmake config

Karolina Surma • 6 months ago

78c84ca

Add-Python-3.13-to-cmake-config.patch

file added

+53

		`@@ -0,0 +1,53 @@`
		`+ From 5b5d123085d5ee2068118926d5fb8c1602745778 Mon Sep 17 00:00:00 2001`
		`+ From: Karolina Surma <ksurma@redhat.com>`
		`+ Date: Tue, 21 Nov 2023 16:09:53 +0100`
		`+ Subject: [PATCH] Add Python 3.13 to cmake config`
		`+`
		`+ ---`
		`+ config/FindPython/Support.cmake \| 2 +-`
		`+ config/FindPythonInterp.cmake \| 2 +-`
		`+ config/FindPythonLibs.cmake \| 2 +-`
		`+ 3 files changed, 3 insertions(+), 3 deletions(-)`
		`+`
		`+ diff --git a/config/FindPython/Support.cmake b/config/FindPython/Support.cmake`
		`+ index 517ac21..b62f536 100644`
		`+ --- a/config/FindPython/Support.cmake`
		`+ +++ b/config/FindPython/Support.cmake`
		`+ @@ -28,7 +28,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)`
		`+ message (FATAL_ERROR "FindPython: INTERNAL ERROR")`
		`+ endif()`
		`+ if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")`
		`+ - set(_${_PYTHON_PREFIX}_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)`
		`+ + set(_${_PYTHON_PREFIX}_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)`
		`+ elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2")`
		`+ set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)`
		`+ else()`
		`+ diff --git a/config/FindPythonInterp.cmake b/config/FindPythonInterp.cmake`
		`+ index 7ad3587..e6dd298 100644`
		`+ --- a/config/FindPythonInterp.cmake`
		`+ +++ b/config/FindPythonInterp.cmake`
		`+ @@ -54,7 +54,7 @@ unset(_Python_NAMES)`
		`+`
		`+ set(_PYTHON1_VERSIONS 1.6 1.5)`
		`+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)`
		`+ -set(_PYTHON3_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)`
		`+ +set(_PYTHON3_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)`
		`+`
		`+ if(PythonInterp_FIND_VERSION)`
		`+ if(PythonInterp_FIND_VERSION_COUNT GREATER 1)`
		`+ diff --git a/config/FindPythonLibs.cmake b/config/FindPythonLibs.cmake`
		`+ index 43a84dd..8dfd060 100644`
		`+ --- a/config/FindPythonLibs.cmake`
		`+ +++ b/config/FindPythonLibs.cmake`
		`+ @@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)`
		`+`
		`+ set(_PYTHON1_VERSIONS 1.6 1.5)`
		`+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)`
		`+ -set(_PYTHON3_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)`
		`+ +set(_PYTHON3_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)`
		`+`
		`+ if(PythonLibs_FIND_VERSION)`
		`+ if(PythonLibs_FIND_VERSION_COUNT GREATER 1)`
		`+ --`
		`+ 2.41.0`
		`+`

rmol.spec

file modified

+3 -1

		`@@ -12,6 +12,8 @@`
		`URL: https://github.com/airsim/%{name}`
		`Source0: %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz`

		`+ Patch: Add-Python-3.13-to-cmake-config.patch`
		`+`
		`BuildRequires: gcc-c++`
		`BuildRequires: cmake`
		`BuildRequires: boost-devel`
		`@@ -79,7 +81,7 @@`


		`%prep`
		`- %autosetup`
		`+ %autosetup -p1`

		`%build`
		`%cmake`

ksurma commented 6 months ago

We've started building Fedora with Python 3.13 as main Python (planned for Fedora 41) and encountered the problem with the bundled CMake scripts in this package. This will enable building in our test Python 3.13 copr.