X-Git-Url: https://git.gag.com/?p=fw%2Fcortex-toolchain;a=blobdiff_plain;f=summon-arm-toolchain;h=6e2748f448e56a00d8803d8873121b7ec510b859;hp=6a00c12ce3401bcae4321d9886487a80c67843fd;hb=5a82a4186134981c85f6f4d8b45d735cbb3a6997;hpb=80dca85c76e3fa5cb9785ece3674b373640f5025

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 6a00c12..6e2748f 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -14,10 +14,10 @@ PREFIX=${HOME}/arm-none-eabi	# 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
 
-BINUTILS=binutils-2.19.1
-GCC=gcc-4.4.2
-NEWLIB=newlib-1.17.0
-GDB=gdb-7.1
+BINUTILS=binutils-2.20
+GCC=gcc-4.5.1
+NEWLIB=newlib-1.18.0
+GDB=gdb-7.2
 LIBCMSIS=v1.10-2
 LIBSTM32=v3.0.0-1
 LIBSTM32USB=v3.0.1-1
@@ -27,6 +27,7 @@ LIBOPENSTM32_EN=0
 
 SUMMON_DIR=$(pwd)
 SOURCES=${SUMMON_DIR}/sources
+STAMPS=${SUMMON_DIR}/stamps
 
 export PATH="${PREFIX}/bin:${PATH}"
 
@@ -34,6 +35,15 @@ GCCFLAGS=
 GDBFLAGS=
 BINUTILFLAGS=
 
+# Fetch a versioned file from a URL
+function fetch {
+    if [ ! -e ${STAMPS}/$1.fetch ]; then
+        echo "Downloading $1 sources..."
+        wget -c --no-passive-ftp $2
+        touch ${STAMPS}/$1.fetch
+    fi
+}
+
 case "$(uname)" in
 	Linux)
 	echo "Found Linux OS."
@@ -42,6 +52,7 @@ case "$(uname)" in
 	echo "Found Darwin OS."
 	GCCFLAGS="--with-gmp=${DARWIN_OPT_PATH} \
 	          --with-mpfr=${DARWIN_OPT_PATH} \
+	          --with-mpc=${DARWIN_OPT_PATH} \
 		  -with-libiconv-prefix=${DARWIN_OPT_PATH}"
 	;;
 	*)
@@ -50,23 +61,14 @@ case "$(uname)" in
 	;;
 esac
 
-if [ ! -e ${SOURCES} ]; then
-    mkdir ${SOURCES}
-fi
+mkdir -p ${STAMPS} ${SOURCES}
 
 cd ${SOURCES}
 
-echo "Downloading binutils sources..."
-wget -c http://ftp.gnu.org/gnu/binutils/${BINUTILS}.tar.bz2
-
-echo "Downloading gcc sources..."
-wget -c http://ftp.gnu.org/gnu/gcc/${GCC}/${GCC}.tar.bz2
-
-echo "Downloading newlib sources..."
-wget -c --no-passive-ftp ftp://sources.redhat.com/pub/newlib/${NEWLIB}.tar.gz
-
-echo "Downloading gdb sources..."
-wget -c http://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2
+fetch ${BINUTILS} http://ftp.gnu.org/gnu/binutils/${BINUTILS}.tar.bz2
+fetch ${GCC} ${GCC_URL}
+fetch ${NEWLIB} ftp://sources.redhat.com/pub/newlib/${NEWLIB}.tar.gz
+fetch ${GDB} http://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2
 
 if [ ${LIBSTM32_EN} != 0 ]; then
 if [ ! -e libcmsis-${LIBCMSIS}.tar.bz2 ]; then
@@ -118,7 +120,7 @@ if [ ! -e build ]; then
     mkdir build
 fi
 
-if [ ! -e .${BINUTILS}.build ]; then
+if [ ! -e ${STAMPS}/${BINUTILS}.build ]; then
     echo "******************************************************************"
     echo "* Unpacking ${BINUTILS}"
     echo "******************************************************************"
@@ -148,11 +150,11 @@ if [ ! -e .${BINUTILS}.build ]; then
     echo "******************************************************************"
     echo "* Cleaning up ${BINUTILS}"
     echo "******************************************************************"
-    touch .${BINUTILS}.build
+    touch ${STAMPS}/${BINUTILS}.build
     rm -rf build/* ${BINUTILS}
 fi
 
-if [ ! -e .${GCC}-boot.build ]; then
+if [ ! -e ${STAMPS}/${GCC}-boot.build ]; then
     echo "******************************************************************"
     echo "* Unpacking ${GCC}-boot"
     echo "******************************************************************"
@@ -186,11 +188,11 @@ if [ ! -e .${GCC}-boot.build ]; then
     echo "******************************************************************"
     echo "* Cleaning up ${GCC}-boot"
     echo "******************************************************************"
-    touch .${GCC}-boot.build
+    touch ${STAMPS}/${GCC}-boot.build
     rm -rf build/* ${GCC}
 fi
 
-if [ ! -e .${NEWLIB}.build ]; then
+if [ ! -e ${STAMPS}/${NEWLIB}.build ]; then
     echo "******************************************************************"
     echo "* Unpacking ${NEWLIB}"
     echo "******************************************************************"
@@ -220,12 +222,12 @@ if [ ! -e .${NEWLIB}.build ]; then
     echo "******************************************************************"
     echo "* Cleaning up ${NEWLIB}"
     echo "******************************************************************"
-    touch .${NEWLIB}.build
+    touch ${STAMPS}/${NEWLIB}.build
     rm -rf build/* ${NEWLIB}
 fi
 
 # Yes, you need to build gcc again!
-if [ ! -e .${GCC}.build ]; then
+if [ ! -e ${STAMPS}/${GCC}.build ]; then
     echo "******************************************************************"
     echo "* Unpacking ${GCC}"
     echo "******************************************************************"
@@ -258,11 +260,11 @@ if [ ! -e .${GCC}.build ]; then
     echo "******************************************************************"
     echo "* Cleaning up ${GCC}"
     echo "******************************************************************"
-    touch .${GCC}.build
+    touch ${STAMPS}/${GCC}.build
     rm -rf build/* ${GCC}
 fi
 
-if [ ! -e .${GDB}.build ]; then
+if [ ! -e ${STAMPS}/${GDB}.build ]; then
     echo "******************************************************************"
     echo "* Unpacking ${GDB}"
     echo "******************************************************************"
@@ -289,7 +291,7 @@ if [ ! -e .${GDB}.build ]; then
     echo "******************************************************************"
     echo "* Cleaning up ${GDB}"
     echo "******************************************************************"
-    touch .${GDB}.build
+    touch ${STAMPS}/${GDB}.build
     rm -rf build/* ${GDB}
 fi