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: v14.2.22~27^2~17^2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=401cba39e6fb9b794cca09177ce264369db2dd86;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>
(cherry picked from commit 6dbd4f59f3c5cd13df4237136134ad7a4fc46549)

Conflicts:
	do_cmake.sh: nautilus still supports python2. so, to
run "make check" with python3 only, we should disable it explicitly.
---

diff --git a/do_cmake.sh b/do_cmake.sh
index ab8f5c8c9769..ac60a5e881ae 100755
--- a/do_cmake.sh
+++ b/do_cmake.sh
@@ -6,7 +6,7 @@ if test -e build; then
     exit 1
 fi
 
-PYBUILD="2"
+PYBUILD="3"
 if [ -r /etc/os-release ]; then
   source /etc/os-release
   case "$ID" in