X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=summon-arm-toolchain;h=4a22be18bb9851cd528b4147cc9967b30e68701a;hb=77f6292113bc4eb2ba6826c4d0dd6c367c1940c4;hp=cfa1b5a5134582c567cc07224a8977be7ba47654;hpb=bffdf8a8506048ede92bc8a17b1b4ee033c5d26d;p=summon-arm-toolchain.git

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index cfa1b5a..4a22be1 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -4,6 +4,7 @@
 
 # adapted for r0ket <http://r0ket.badge.events.ccc.de> development by
 # Matthias Rampke <matthias@rampke.de>
+# requires Homebrew <https://mxcl.github.com/homebrew>
 
 # Stop if any command fails
 set -e
@@ -15,7 +16,6 @@ set -e
 TARGET=arm-eabi		# Or: TARGET=arm-elf
 PREFIX=${HOME}/arm	# Install location of your final toolchain
 PARALLEL=			# Or: PARALLEL="-j 5" for 4 CPUs
-DARWIN_CELLAR=$(brew --cellar)	# Path in which MacPorts or Fink is installed
 # Set to 'sudo' if you need superuser privileges while installing
 SUDO=''
 # Set to 1 to be quieter while running
@@ -44,7 +44,7 @@ else
 	GCCRELEASE=4.6-2011.07
 	GCCVERSION=${GCCRELEASE}
 	GCC=gcc-linaro-${GCCVERSION}
-	GCCURL=http://launchpad.net/gcc-linaro/4.5/${GCCRELEASE}/+download/${GCC}.tar.bz2
+	GCCURL=http://launchpad.net/gcc-linaro/4.6/${GCCRELEASE}/+download/${GCC}.tar.bz2
 fi
 
 BINUTILS=binutils-2.21
@@ -119,11 +119,11 @@ case "$(uname)" in
 	DARWINDEPS="gnu-tar wget mpfr libmpc gmp"
   DARWINDEPSCOUNT=4
 
-  echo "Installing dependencies"
+  echo "Installing dependencies ..."
   if ! which brew > /dev/null; then
-    echo "homebrew not installed."
+    echo "Homebrew not installed."
   else
-    brew install ${DARWINDEPS} | grep -v '^Warning: Formula already installed: '
+      brew install ${DARWINDEPS} | (grep -v '^Warning: Formula already installed: ' || true)
   fi
 
   GCCFLAGS="${GCCFLAGS} \
@@ -134,7 +134,6 @@ case "$(uname)" in
 
   TAR=gnutar
 
-		  --with-libiconv-prefix=${DARWIN_OPT_PATH}"
 	OOCD_CFLAGS="-m32 -I/opt/mine/include -I/opt/local/include"
 	OOCD_LDFLAGS="-L/opt/mine/lib -L/opt/local/lib"
 	;;
@@ -156,7 +155,7 @@ esac
 function fetch {
     if [ ! -e ${STAMPS}/$1.fetch ]; then
         log "Downloading $1 sources..."
-        wget -c --no-passive-ftp $2
+        wget -c $2
         touch ${STAMPS}/$1.fetch
     fi
 }