X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=summon-arm-toolchain;h=708869c7383b2fe885edd75cbe71a97ddca97e86;hb=c3490ef1da19fbcfbf08dbe0fff32809e3025203;hp=2a12296a9531dc6197046c362d728e7538d90f01;hpb=e739ab803544aa524066e4e9dcd490e4ab6ea5d1;p=summon-arm-toolchain.git

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 2a12296..708869c 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -2,14 +2,9 @@
 # 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>
+# requires Homebrew <https://mxcl.github.com/homebrew>
 
 # Stop if any command fails
 set -e
@@ -18,13 +13,13 @@ set -e
 # Settings section
 # You probably want to customize those
 ##############################################################################
-TARGET=arm-none-eabi		# Or: TARGET=arm-elf
-PREFIX=${HOME}/sat	# Install location of your final toolchain
-DARWIN_OPT_PATH=/opt/local	# Path in which MacPorts or Fink is installed
+TARGET=arm-eabi		# Or: TARGET=arm-elf
+PREFIX=${HOME}/arm	# Install location of your final toolchain
+PARALLEL=			# Or: PARALLEL="-j 5" for 4 CPUs
 # Set to 'sudo' if you need superuser privileges while installing
-SUDO=
+SUDO=''
 # Set to 1 to be quieter while running
-QUIET=0
+QUIET=1
 # Set to 1 to use linaro gcc instead of the FSF gcc
 USE_LINARO=1
 # Set to 1 to enable building of OpenOCD
@@ -34,7 +29,7 @@ LIBSTM32_EN=0
 # Set to 1 to build libopenstm32 an open source library for stm32
 LIBOPENSTM32_EN=1
 # Make the gcc default to Cortex-M3
-DEFAULT_TO_CORTEX_M3=0
+DEFAULT_TO_CORTEX_M3=1
 
 ##############################################################################
 # Version and download url settings section
@@ -46,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
+	GCCURL=http://launchpad.net/gcc-linaro/4.6/${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
@@ -119,11 +114,26 @@ case "$(uname)" in
 	;;
 	Darwin)
 	echo "Found Darwin OS."
-	GCCFLAGS="${GCCFLAGS} \
-                  --with-gmp=${DARWIN_OPT_PATH} \
-	          --with-mpfr=${DARWIN_OPT_PATH} \
-	          --with-mpc=${DARWIN_OPT_PATH} \
-		  -with-libiconv-prefix=${DARWIN_OPT_PATH}"
+
+	# darwin dependencies
+	DARWINDEPS="wget mpfr libmpc gmp"
+  DARWINDEPSCOUNT=4
+
+  echo "Installing dependencies ..."
+  if ! which brew > /dev/null; then
+    echo "Homebrew not installed."
+  else
+      brew install ${DARWINDEPS} | (grep -v '^Warning: Formula already installed: ' || true)
+  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
+
 	OOCD_CFLAGS="-m32 -I/opt/mine/include -I/opt/local/include"
 	OOCD_LDFLAGS="-L/opt/mine/lib -L/opt/local/lib"
 	;;
@@ -145,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
 }
@@ -383,8 +393,8 @@ if [ ! -e ${STAMPS}/openocd-${OOCD}.build ]; then
     unpack openocd-${OOCD}
     cd build
     log "Configuring openocd-${OOCD}"
-    export CFLAGS="${OOCD_CFLAGS}"
-    export LDFLAGS="${OOCD_LDFLAGS}"
+    CFLAGS="${CFLAGS} ${OOCD_CFLAGS}" \
+    LDFLAGS="${LDFLAGS} ${OOCD_LDFLAGS}" \
     ../openocd-${OOCD}/configure --enable-maintainer-mode \
                       --prefix=${PREFIX} \
                       --enable-dummy \