support getting number of CPUs on FreeBSD et al.

[summon-arm-toolchain.git] / summon-arm-toolchain

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 7ede3599254c5bf4d13b3040774ad0a69d2591e0..9577702c3e5e41a91fd46c362282a3f859ac28e3 100755 (executable)
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -72,8 +72,10 @@ b2269d30ce7b93b7c714b90ef2f40221c2df0fcd  newlib-1.19.0.tar.gz"
 # Flags section
 ##############################################################################
 
-if which getconf > /dev/null; then
+if which getconf > /dev/null && getconf _NPROCESSORS_ONLN > /dev/null; then
        CPUS=$(getconf _NPROCESSORS_ONLN)
+elif which sysctl > /dev/null && sysctl hw.ncpu > /dev/null; then
+  CPUS=$(sysctl hw.ncpu | sed -E -e 's/^hw\.ncpu(: | = )//')
 else
        CPUS=1
 fi
@@ -95,12 +97,13 @@ if [ -f local.sh ]; then
     . ./local.sh
 fi
 
-MAKEFLAGS=${PARALLEL}
+MAKEFLAGS=${PARALLEL} ${MAKESILENT}
 TARFLAGS=v
+MAKESILENT=
 
 if [ ${QUIET} != 0 ]; then
     TARFLAGS=
-    MAKEFLAGS="${MAKEFLAGS} -s"
+    MAKESILENT="-s"
 fi
 
 export PATH="${PREFIX}/bin:${PATH}"
@@ -119,9 +122,9 @@ STAMPS=${SUMMON_DIR}/stamps
 if which fetch > /dev/null; then
     FETCHCMD="fetch -p"
 elif which wget > /dev/null; then
-    FETCHCMD=wget
+    FETCHCMD="wget -c"
 elif which curl > /dev/null; then
-    FETCHCMD="curl -O -L"
+    FETCHCMD="curl -C - -O -L"
 else
     FETCHCMD=ftp    # the only HTTP client on some BSD
 fi
@@ -185,7 +188,7 @@ unpack() {
 # Install a build
 doinstall() {
     log $1
-    ${SUDO} make ${MAKEFLAGS} $2 $3 $4 $5 $6 $7 $8
+    ${SUDO} make ${MAKESILENT} $2 $3 $4 $5 $6 $7 $8
 }
 
 if [ ! -d $SUMMON_DIR ]; then
@@ -207,7 +210,9 @@ fetch ${MPFR} http://www.mpfr.org/${MPFR}/${MPFR}.tar.bz2
 fetch ${MPC} http://www.multiprecision.org/mpc/download/${MPC}.tar.gz
 
 if which sha1sum > /dev/null; then
-    ( echo "$SHA1SUMS" | sha1sum -c - ) || ( log 'ERROR: Checksum fail!'; exit 1 )
+    for f in ${BINUTILS} ${GCC} ${NEWLIB} ${GDB} ${GMP} ${MPFR} ${MPC}; do
+        ( echo "$SHA1SUMS" | grep -F $f | sha1sum -c - ) || ( log 'ERROR: Checksum fail!'; exit 1 )
+    done
 else
     log "WARING: skipping checksum checks due to missing sha1sum"
 fi