]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: check for python(\d)\.(\d+) when building boost 46365/head
authorKefu Chai <tchaikov@gmail.com>
Thu, 18 Nov 2021 16:18:13 +0000 (00:18 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 23 May 2022 11:17:57 +0000 (19:17 +0800)
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)

cmake/modules/BuildBoost.cmake

index 468ae419c0007afe05eafc01ddf4f14ad4d2eb4b..320c2dcd524977b321cd593daa5d708e85792c0e 100644 (file)
@@ -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()