From: Kefu Chai <kchai@redhat.com>
Date: Thu, 4 Mar 2021 06:30:17 +0000 (+0800)
Subject: do_cmake: always pass -DWITH_PYTHON3 to cmake
X-Git-Tag: v17.1.0~2681^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6dbd4f59f3c5cd13df4237136134ad7a4fc46549;p=ceph.git

do_cmake: always pass -DWITH_PYTHON3 to cmake

do not pretend that we support python2 anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/do_cmake.sh b/do_cmake.sh
index 8779d721339c..d56212af7641 100755
--- a/do_cmake.sh
+++ b/do_cmake.sh
@@ -13,7 +13,7 @@ if [ -e $BUILD_DIR ]; then
     exit 1
 fi
 
-PYBUILD="2"
+PYBUILD="3"
 ARGS="-GNinja"
 if [ -r /etc/os-release ]; then
   source /etc/os-release
@@ -47,9 +47,7 @@ else
   exit 1
 fi
 
-if [[ "$PYBUILD" =~ ^3(\..*)?$ ]] ; then
-    ARGS+=" -DWITH_PYTHON3=${PYBUILD}"
-fi
+ARGS+=" -DWITH_PYTHON3=${PYBUILD}"
 
 if type ccache > /dev/null 2>&1 ; then
     echo "enabling ccache"