mirror of
https://github.com/ceph/ceph
synced 2026-08-02 07:03:18 +00:00
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>
This commit is contained in:
parent
1006b62fe6
commit
44c6a47fb6
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user