From bd50d3a02ea03710a38b651c25d3820d38224ae6 Mon Sep 17 00:00:00 2001 From: wangzengliang Date: Fri, 8 Apr 2022 09:07:14 +0800 Subject: [PATCH] cmake: add support python 3.10 --- 0004-cmake-add-support-python-3.10.patch | 25 ++++++++++++++++++++++++ ceph.spec | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 0004-cmake-add-support-python-3.10.patch diff --git a/0004-cmake-add-support-python-3.10.patch b/0004-cmake-add-support-python-3.10.patch new file mode 100644 index 0000000..005054d --- /dev/null +++ b/0004-cmake-add-support-python-3.10.patch @@ -0,0 +1,25 @@ +From c8c89461fd7e67d2aa0107eee4f7856bc6c7b474 Mon Sep 17 00:00:00 2001 +From: wangzengliang +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 + diff --git a/ceph.spec b/ceph.spec index 24a2f26..1754e14 100644 --- a/ceph.spec +++ b/ceph.spec @@ -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 Patch2: 0002-enable-install-deps-in-openEuler.patch Patch3: 0003-isa-l-update.patch +Patch4: 0004-cmake-add-support-python-3.10.patch %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -2484,6 +2485,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri Mar 11 2022 wangzengliang - 1:16.2.7-3 +- cmake: add support python 3.10 + * Fri Mar 11 2022 wangzengliang - 1:16.2.7-2 - fix * recognition error when install