X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=summon-arm-toolchain;h=c97e5f85a4a173a8fd611e69ffd2380034e42125;hb=a82cc53f09a9ed18a7e9dc6c6f65554252e2eb63;hp=c6006a39f54c95812d4f133e7f41a79d282a3dbf;hpb=78b986bc549315edffece8f2a933929d0912f4ed;p=summon-arm-toolchain.git

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index c6006a3..c97e5f8 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -2,14 +2,8 @@
 # Written by Uwe Hermann <uwe@hermann-uwe.de>, released as public domain.
 # Modified by Piotr Esden-Tempski <piotr@esden.net>, released as public domain.
 
-#
-# Requirements (example is for Debian, replace package names as needed):
-#
-# apt-get install flex bison libgmp3-dev libmpfr-dev libncurses5-dev \
-# libmpc-dev autoconf texinfo build-essential
-#
-# Or on Ubuntu Maverick give `apt-get build-dep gcc-4.5` a try.
-#
+# adapted for r0ket <http://r0ket.badge.events.ccc.de> development by
+# Matthias Rampke <matthias@rampke.de>
 
 # Stop if any command fails
 set -e
@@ -47,15 +41,15 @@ if [ ${USE_LINARO} == 0 ] ; then
 	GCCURL=http://ftp.gnu.org/gnu/gcc/${GCC}/${GCC}.tar.gz
 else
 	# For the Linaro GCC:
-	GCCRELEASE=4.5-2010.11-0
-	GCCVERSION=4.5-2010.11-1
+	GCCRELEASE=4.6-2011.07
+	GCCVERSION=${GCCRELEASE}
 	GCC=gcc-linaro-${GCCVERSION}
 	GCCURL=http://launchpad.net/gcc-linaro/4.5/${GCCRELEASE}/+download/${GCC}.tar.bz2
 fi
 
-BINUTILS=binutils-2.20
-NEWLIB=newlib-1.18.0
-GDB=gdb-7.2
+BINUTILS=binutils-2.21
+NEWLIB=newlib-1.19.0
+GDB=gdb-7.3
 OOCD=master
 LIBCMSIS=v1.10-2
 LIBSTM32=v3.0.0-1
@@ -122,37 +116,24 @@ case "$(uname)" in
 	echo "Found Darwin OS."
 
 	# darwin dependencies
-	DARWINDEPS="gnutar mpfr libmpc gmp"
+	DARWINDEPS="gnu-tar wget mpfr libmpc gmp"
   DARWINDEPSCOUNT=4
 
-  GCCFLAGS="${GCCFLAGS} \
-            --with-gmp=${DARWIN_OPT_PATH} \
-	          --with-mpfr=${DARWIN_OPT_PATH} \
-	          --with-mpc=${DARWIN_OPT_PATH} \
-		        -with-libiconv-prefix=${DARWIN_OPT_PATH}"
-
-  echo "Attempting to automatically check if common dependencies are installed on your system"
-  if ! which port > /dev/null; then
-    echo "MacPorts not installed."
+  echo "Installing dependencies"
+  if ! which brew > /dev/null; then
+    echo "homebrew not installed."
   else
-    pc=`port installed ${DARWINDEPS} | wc -l | tr -d " "`
-    if [ ${pc} -lt $[${DARWINDEPSCOUNT}+1] ];
-    then
-      echo "Something is missing, do you want to install everything needed?"
-      echo "(You need super user rights to do this.)"
-
-      if [ read = "y" || read = "yes" ];
-      then
-        sudo port install ${DARWINDEPS}
-      fi
-    else
-      echo "Found: "${DARWINDEPS}"!"
-    fi
+    brew install ${DARWINDEPS} | grep -v '^Warning: Formula already installed: '
   fi
 
+  GCCFLAGS="${GCCFLAGS} \
+      --with-gmp=$(brew --prefix gmp) \
+      --with-mpfr=$(brew --prefix mpfr) \
+                  --with-mpc=$(brew --prefix mpc)
+  -with-libiconv-prefix=$(brew --prefix libiconv)"
+
   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"
 	;;