]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
build/ops: run-make-check.sh: handle Python 2 absence
authorNathan Cutler <ncutler@suse.com>
Mon, 19 Feb 2018 11:05:48 +0000 (12:05 +0100)
committerNathan Cutler <ncutler@suse.com>
Mon, 23 Apr 2018 08:50:01 +0000 (10:50 +0200)
Building Ceph without Python 2 requires passing certain options to cmake.

Fixes: http://tracker.ceph.com/issues/23035
Signed-off-by: Nathan Cutler <ncutler@suse.com>
run-make-check.sh

index 86f7f2053bb5a7fdf9409edb91bf030155bd5a48..46745352cd80afd4c8c4a57688111473733b3d59 100755 (executable)
@@ -69,7 +69,12 @@ function run() {
     BUILD_MAKEOPTS=${BUILD_MAKEOPTS:-$DEFAULT_MAKEOPTS}
     CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS}
 
-    $DRY_RUN ./do_cmake.sh -DWITH_FIO=ON $@ || return 1
+    CMAKE_PYTHON_OPTS=
+    if ! type python2 > /dev/null 2>&1 ; then
+        CMAKE_PYTHON_OPTS="-DWITH_PYTHON2=OFF -DWITH_PYTHON3=ON -DMGR_PYTHON_VERSION=3"
+    fi
+
+    $DRY_RUN ./do_cmake.sh -DWITH_FIO=ON $CMAKE_PYTHON_OPTS $@ || return 1
     $DRY_RUN cd build
     $DRY_RUN make $BUILD_MAKEOPTS tests || return 1
     # prevent OSD EMFILE death on tests, make sure large than 1024