cmake: add support python 3.10

This commit is contained in:
wangzengliang 2022-04-08 09:07:14 +08:00
parent 173682e272
commit bd50d3a02e
2 changed files with 29 additions and 0 deletions

View File

@ -0,0 +1,25 @@
From c8c89461fd7e67d2aa0107eee4f7856bc6c7b474 Mon Sep 17 00:00:00 2001
From: wangzengliang <wangzengliang1@huawei.com>
Date: Fri, 8 Apr 2022 09:01:21 +0800
Subject: [PATCH] cmake: add support python 3.10
---
cmake/modules/FindPython/Support.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/modules/FindPython/Support.cmake b/cmake/modules/FindPython/Support.cmake
index c05bbe330..fb362bfe2 100644
--- a/cmake/modules/FindPython/Support.cmake
+++ b/cmake/modules/FindPython/Support.cmake
@@ -17,7 +17,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.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ set(_${_PYTHON_PREFIX}_VERSIONS 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()
--
2.30.0

View File

@ -146,6 +146,7 @@ Source0: %{?_remote_tarball_prefix}ceph-16.2.7.tar.gz
Patch1: 0001-fix-error-transform-is-not-a-member-of-std.patch Patch1: 0001-fix-error-transform-is-not-a-member-of-std.patch
Patch2: 0002-enable-install-deps-in-openEuler.patch Patch2: 0002-enable-install-deps-in-openEuler.patch
Patch3: 0003-isa-l-update.patch Patch3: 0003-isa-l-update.patch
Patch4: 0004-cmake-add-support-python-3.10.patch
%if 0%{?suse_version} %if 0%{?suse_version}
# _insert_obs_source_lines_here # _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -2484,6 +2485,9 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog %changelog
* Fri Mar 11 2022 wangzengliang <wangzengliang1@huawei.com> - 1:16.2.7-3
- cmake: add support python 3.10
* Fri Mar 11 2022 wangzengliang <wangzengliang1@huawei.com> - 1:16.2.7-2 * Fri Mar 11 2022 wangzengliang <wangzengliang1@huawei.com> - 1:16.2.7-2
- fix * recognition error when install - fix * recognition error when install