From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 18 Nov 2021 16:18:13 +0000 (+0800)
Subject: cmake: check for python(\d)\.(\d+) when building boost
X-Git-Tag: v16.2.11~533^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ac509ce9dbb8201a349b46bafbb642a455c54c2;p=ceph.git

cmake: check for python(\d)\.(\d+) when building boost

now that python3.10 has two digits as its minor version, we should be
able to match it.

this change fixes the build with python3.10. without this change, we'd
have

error: wrong library name 'python310' in the --with-<library> option.

when building with python3.10

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 66b1e8cecdbabd76a131dc239f6f41d5374fbd32)
---

diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
index 468ae419c000..320c2dcd5249 100644
--- a/cmake/modules/BuildBoost.cmake
+++ b/cmake/modules/BuildBoost.cmake
@@ -70,7 +70,7 @@ function(do_build_boost version)
     if(c MATCHES "^python([0-9])\$")
       set(with_python_version "${CMAKE_MATCH_1}")
       list(APPEND boost_with_libs "python")
-    elseif(c MATCHES "^python([0-9])\\.?([0-9])\$")
+    elseif(c MATCHES "^python([0-9])\\.?([0-9]+)\$")
       set(with_python_version "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}")
       list(APPEND boost_with_libs "python")
     else()