From: Alan Somers <asomers@gmail.com>
Date: Mon, 25 Sep 2017 21:01:49 +0000 (-0600)
Subject: do_{cmake,freebsd}: Don't invoke nproc(1) on FreeBSD
X-Git-Tag: v13.0.1~789^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17949%2Fhead;p=ceph.git

do_{cmake,freebsd}: Don't invoke nproc(1) on FreeBSD

Use sysctl(8) instead.  Also, there's no longer any need for /bin/bash
on FreeBSD.

Signed-off-by: Alan Somers <asomers@gmail.com>
---

diff --git a/do_cmake.sh b/do_cmake.sh
index 739da8e5b0ce..b8e092d1332c 100755
--- a/do_cmake.sh
+++ b/do_cmake.sh
@@ -13,7 +13,8 @@ fi
 
 mkdir build
 cd build
-cmake -DBOOST_J=$(nproc) $ARGS "$@" ..
+NPROC=${NPROC:-$(nproc)}
+cmake -DBOOST_J=$NPROC $ARGS "$@" ..
 
 # minimal config to find plugins
 cat <<EOF > ceph.conf
diff --git a/do_freebsd.sh b/do_freebsd.sh
index bf9007488f06..2cfa8fa6a7c7 100755
--- a/do_freebsd.sh
+++ b/do_freebsd.sh
@@ -1,14 +1,6 @@
 #!/bin/sh -xve
-NPROC=`sysctl -n hw.ncpu`
+export NPROC=`sysctl -n hw.ncpu`
 
-# we need bash first otherwise almost nothing will work
-if [ ! -L /bin/bash ]; then
-    echo install bash and link /bin/bash to /usr/local/bin/bash
-    echo Run:
-    echo     sudo pkg install bash
-    echo     ln -s /usr/local/bin/bash /bin/bash
-    exit 1
-fi
 if [ x"$1"x = x"--deps"x ]; then
     sudo ./install-deps.sh
 fi