X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=summon-arm-toolchain;h=e4979b135998855e8623def6a1cc76cc1757e70e;hb=213d671bf4859787fed3c9edec820b3eb89f5ec0;hp=c36e03eac18b8512d5cd818a89f2f5ba73e2582a;hpb=52a03c4d4a084a90e38d3a973134679175142bdb;p=summon-arm-toolchain.git

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index c36e03e..e4979b1 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
@@ -116,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"
 	;;