From: Kefu Chai <kchai@redhat.com>
Date: Wed, 11 Aug 2021 09:32:20 +0000 (+0800)
Subject: do_cmake:sh: do not set BOOST_J
X-Git-Tag: v17.1.0~1142^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7720651ea94cad4fe7fbb7fabe83fef16f6a973f;p=ceph-ci.git

do_cmake:sh: do not set BOOST_J

do_cmake.sh is called by src/script/run-make.sh in configure() function,
in src/script/run-make.sh, BOOST_J is also set if it is not set. so we
can drop the code setting BOOST_J in do_cmake.sh.

this helps to silence the cmake warning like:

CMake Warning:
  Manually-specified variables were not used by the project:

    BOOST_J

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

diff --git a/do_cmake.sh b/do_cmake.sh
index 318715dafc0..3eb9b08d8af 100755
--- a/do_cmake.sh
+++ b/do_cmake.sh
@@ -59,11 +59,6 @@ if type ccache > /dev/null 2>&1 ; then
     ARGS+=" -DWITH_CCACHE=ON"
 fi
 
-if [[ ! "$ARGS $@" =~ "-DBOOST_J" ]] ; then
-    ncpu=$(getconf _NPROCESSORS_ONLN 2>&1)
-    [ -n "$ncpu" -a "$ncpu" -gt 1 ] && ARGS+=" -DBOOST_J=$(expr $ncpu / 2)"
-fi
-
 mkdir $BUILD_DIR
 cd $BUILD_DIR
 if type cmake3 > /dev/null 2>&1 ; then