X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=summon-arm-toolchain;h=a802697c63b71637f118451e7d09399e837c7d3f;hb=2d05c56958e1aaf94b39a5a16377fdb96bc36ad7;hp=6c72dc29f52c2f0359c7471aff360249e8ef700b;hpb=c85096f63c88907b48c758655d9909d8af136cdb;p=summon-arm-toolchain.git

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 6c72dc2..a802697 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,12 +13,11 @@ set -e
 # Settings section
 # You probably want to customize those
 ##############################################################################
-TARGET=arm-elf		# Or: TARGET=arm-elf
-PREFIX=/arm	# Install location of your final toolchain
+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_OPT_PATH=/opt/local	# Path in which MacPorts or Fink is installed
 # Set to 'sudo' if you need superuser privileges while installing
-SUDO='sudo'
+SUDO=''
 # Set to 1 to be quieter while running
 QUIET=0
 # Set to 1 to use linaro gcc instead of the FSF gcc
@@ -35,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
@@ -44,18 +38,20 @@ if [ ${USE_LINARO} == 0 ] ; then
 	# For FSF GCC:
 	GCCVERSION=4.5.1
 	GCC=gcc-${GCCVERSION}
+        GCCDIR=${GCC}
 	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
-	GCC=gcc-linaro-${GCCVERSION}
-	GCCURL=http://launchpad.net/gcc-linaro/4.5/${GCCRELEASE}/+download/${GCC}.tar.bz2
+	GCCRELEASE=4.6-2011.07
+	GCCVERSION=4.6-2011.07-0
+        GCC=gcc-linaro-${GCCRELEASE}
+	GCCDIR=gcc-linaro-${GCCVERSION}
+	GCCURL=http://launchpad.net/gcc-linaro/4.6/${GCCRELEASE}/+download/gcc-linaro-${GCCRELEASE}.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 +118,24 @@ case "$(uname)" in
 	echo "Found Darwin OS."
 
 	# darwin dependencies
-	DARWINDEPS="gnutar mpfr libmpc gmp"
+	DARWINDEPS="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: ' || 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
 
-		  --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"
 	;;
@@ -174,7 +157,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
 }
@@ -315,7 +298,7 @@ if [ ! -e ${STAMPS}/${GCC}-boot.build ]; then
     unpack ${GCC} boot
     cd build
     log "Configuring ${GCC}-boot"
-    ../${GCC}/configure --target=${TARGET} \
+    ../${GCCDIR}/configure --target=${TARGET} \
                       --prefix=${PREFIX} \
                       --enable-interwork \
                       --enable-multilib \
@@ -335,7 +318,7 @@ if [ ! -e ${STAMPS}/${GCC}-boot.build ]; then
     cd ..
     log "Cleaning up ${GCC}-boot"
     touch ${STAMPS}/${GCC}-boot.build
-    rm -rf build/* ${GCC}
+    rm -rf build/* ${GCCDIR}
 fi
 
 if [ ! -e ${STAMPS}/${NEWLIB}.build ]; then
@@ -366,7 +349,7 @@ if [ ! -e ${STAMPS}/${GCC}.build ]; then
     unpack ${GCC}
     cd build
     log "Configuring ${GCC}"
-    ../${GCC}/configure --target=${TARGET} \
+    ../${GCCDIR}/configure --target=${TARGET} \
                       --prefix=${PREFIX} \
                       --enable-interwork \
                       --enable-multilib \
@@ -385,7 +368,7 @@ if [ ! -e ${STAMPS}/${GCC}.build ]; then
     cd ..
     log "Cleaning up ${GCC}"
     touch ${STAMPS}/${GCC}.build
-    rm -rf build/* ${GCC}
+    rm -rf build/* ${GCCDIR}
 fi
 
 if [ ! -e ${STAMPS}/${GDB}.build ]; then