FIX output catching and presence testing

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

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 31c7991b350d21f9f822eaa73307473c35ba5209..5706b8135c2fd8e193d6c5f8b61e6da1d3d44a5d 100755 (executable)
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -58,12 +58,24 @@ GMP=gmp-5.0.2
 MPFR=mpfr-3.0.1
 MPC=mpc-0.9
 
+SHA1SUMS="ef93235588eb443e4c4a77f229a8d131bccaecc6  binutils-2.21.tar.bz2
+8bf66f7a71534ba564563a0ba0b2517aead8ac30  gcc-4.6.1.tar.bz2
+9b766705f051ffb7321de58f247688b0ae661b98  gcc-core-4.6.1.tar.bz2
+828d99a63e0578879150f5681d234763cff69313  gcc-linaro-4.6-2011.07.tar.bz2
+fefd90275d6decdca00c5c29c533e2ef3d439664  gdb-7.3.tar.bz2
+2968220e1988eabb61f921d11e5d2db5431e0a35  gmp-5.0.2.tar.bz2
+229722d553030734d49731844abfef7617b64f1a  mpc-0.9.tar.gz
+fbf402fc196724ae60ef01eb6ca8490b1ea4db69  mpfr-3.0.1.tar.bz2
+b2269d30ce7b93b7c714b90ef2f40221c2df0fcd  newlib-1.19.0.tar.gz"
+
 ##############################################################################
 # Flags section
 ##############################################################################
 
-if which getconf > /dev/null; then
+if which getconf > /dev/null 2> /dev/null && getconf _NPROCESSORS_ONLN > /dev/null 2> /dev/null; then
        CPUS=$(getconf _NPROCESSORS_ONLN)
+elif which sysctl > /dev/null 2> /dev/null && sysctl hw.ncpu 2> /dev/null > /dev/null; then
+  CPUS=$(sysctl hw.ncpu | sed -E -e 's/^hw\.ncpu(: | = )//')
 else
        CPUS=1
 fi
@@ -85,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}"
@@ -109,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"
+    FETCHCMD="curl -C - -O -L"
 else
     FETCHCMD=ftp    # the only HTTP client on some BSD
 fi
@@ -134,7 +147,7 @@ fi
 ##############################################################################
 
 # Fetch a versioned file from a URL
-fetch() {
+dofetch() {
     if [ ! -e ${STAMPS}/$1.fetch ]; then
         log "Downloading $1 sources..."
         ${FETCHCMD} $2
@@ -175,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
@@ -188,13 +201,21 @@ mkdir -p ${STAMPS} ${SOURCES}
 
 cd ${SOURCES}
 
-fetch ${BINUTILS} http://ftp.gnu.org/gnu/binutils/${BINUTILS}.tar.bz2
-fetch ${GCC} ${GCCURL}
-fetch ${NEWLIB} ftp://sources.redhat.com/pub/newlib/${NEWLIB}.tar.gz
-fetch ${GDB} http://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2
-fetch ${GMP} ftp://ftp.gmplib.org/pub/${GMP}/${GMP}.tar.bz2
-fetch ${MPFR} http://www.mpfr.org/${MPFR}/${MPFR}.tar.bz2
-fetch ${MPC} http://www.multiprecision.org/mpc/download/${MPC}.tar.gz
+dofetch ${BINUTILS} http://ftp.gnu.org/gnu/binutils/${BINUTILS}.tar.bz2
+dofetch ${GCC} ${GCCURL}
+dofetch ${NEWLIB} ftp://sources.redhat.com/pub/newlib/${NEWLIB}.tar.gz
+dofetch ${GDB} http://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2
+dofetch ${GMP} ftp://ftp.gmplib.org/pub/${GMP}/${GMP}.tar.bz2
+dofetch ${MPFR} http://www.mpfr.org/${MPFR}/${MPFR}.tar.bz2
+dofetch ${MPC} http://www.multiprecision.org/mpc/download/${MPC}.tar.gz
+
+if which sha1sum > /dev/null; then
+    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
 
 cd ${SUMMON_DIR}