Made more of unpack() common. Use wildcards to pick up different compression types.

[fw/cortex-toolchain] / summon-arm-toolchain

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index c04d664f4b4e40a3bc688ba3ee8decf3e5edc3ac..fa6d103dfdefe14a67a08be468f29c904d7eec46 100755 (executable)
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -9,6 +9,9 @@
 # libmpc-dev autoconf texinfo build-essential
 #
 
+# Stop if any command fails
+set -e
+
 TARGET=arm-none-eabi           # Or: TARGET=arm-elf
 PREFIX=${HOME}/arm-none-eabi   # Install location of your final toolchain
 PARALLEL=                      # Or: PARALLEL="-j 5" for 4 CPUs
@@ -25,6 +28,7 @@ LIBOPENSTM32=master
 LIBSTM32_EN=0
 LIBOPENSTM32_EN=0
 
+SUDO=
 SUMMON_DIR=$(pwd)
 SOURCES=${SUMMON_DIR}/sources
 STAMPS=${SUMMON_DIR}/stamps
@@ -53,8 +57,15 @@ function log {
 
 # Unpack an archive
 function unpack {
+    log Unpacking $*
     # Use 'auto' mode decompression.  Replace with a switch if tar doesn't support -a
-    tar xvaf $1
+    tar xvaf ${SOURCES}/$1.tar.*
+}
+
+# Install a build
+function install {
+    log $1
+    ${SUDO} make ${PARALLEL} $2 $3 $4 $5 $6 $7 $8
 }
 
 case "$(uname)" in
@@ -80,7 +91,7 @@ mkdir -p ${STAMPS} ${SOURCES}
 cd ${SOURCES}
 
 fetch ${BINUTILS} http://ftp.gnu.org/gnu/binutils/${BINUTILS}.tar.bz2
-fetch ${GCC} ${GCC_URL}
+fetch ${GCC} http://ftp.gnu.org/gnu/gcc/${GCC}/${GCC}.tar.gz
 fetch ${NEWLIB} ftp://sources.redhat.com/pub/newlib/${NEWLIB}.tar.gz
 fetch ${GDB} http://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2
 
@@ -135,8 +146,7 @@ if [ ! -e build ]; then
 fi
 
 if [ ! -e ${STAMPS}/${BINUTILS}.build ]; then
-    log "Unpacking ${BINUTILS}"
-    unpack ${SOURCES}/${BINUTILS}.tar.bz2
+    unpack ${BINUTILS}
     cd build
     log "Configuring ${BINUTILS}"
     ../${BINUTILS}/configure --target=${TARGET} \
@@ -147,11 +157,10 @@ if [ ! -e ${STAMPS}/${BINUTILS}.build ]; then
                            --with-gnu-ld \
                            --disable-nls \
                            --disable-werror \
-                          ${BINUTILFLAGS} || exit
+                          ${BINUTILFLAGS}
     log "Building ${BINUTILS}"
-    make ${PARALLEL} || exit
-    log "Installing ${BINUTILS}"
-    make install || exit
+    make ${PARALLEL}
+    install ${BINUTILS} install
     cd ..
     log "Cleaning up ${BINUTILS}"
     touch ${STAMPS}/${BINUTILS}.build
@@ -159,8 +168,7 @@ if [ ! -e ${STAMPS}/${BINUTILS}.build ]; then
 fi
 
 if [ ! -e ${STAMPS}/${GCC}-boot.build ]; then
-    log "Unpacking ${GCC}-boot"
-    unpack ${SOURCES}/${GCC}.tar.bz2
+    unpack ${GCC} boot
     cd build
     log "Configuring ${GCC}-boot"
     ../${GCC}/configure --target=${TARGET} \
@@ -175,11 +183,10 @@ if [ ! -e ${STAMPS}/${GCC}-boot.build ]; then
                       --with-gnu-ld \
                       --disable-nls \
                       --disable-werror \
-                     ${GCCFLAGS} || exit
+                     ${GCCFLAGS}
     log "Building ${GCC}-boot"
-    make ${PARALLEL} all-gcc || exit
-    log "Installing ${GCC}-boot"
-    make install-gcc || exit
+    make ${PARALLEL} all-gcc
+    install ${GCC}-boot install-gcc
     cd ..
     log "Cleaning up ${GCC}-boot"
     touch ${STAMPS}/${GCC}-boot.build
@@ -187,8 +194,7 @@ if [ ! -e ${STAMPS}/${GCC}-boot.build ]; then
 fi
 
 if [ ! -e ${STAMPS}/${NEWLIB}.build ]; then
-    log "Unpacking ${NEWLIB}"
-    unpack ${SOURCES}/${NEWLIB}.tar.gz
+    unpack ${NEWLIB}
     cd build
     log "Configuring ${NEWLIB}"
     ../${NEWLIB}/configure --target=${TARGET} \
@@ -199,11 +205,10 @@ if [ ! -e ${STAMPS}/${NEWLIB}.build ]; then
                          --with-gnu-ld \
                          --disable-nls \
                          --disable-werror \
-                         --disable-newlib-supplied-syscalls || exit
+                         --disable-newlib-supplied-syscalls
     log "Building ${NEWLIB}"
-    make ${PARALLEL} || exit
-    log "Installing ${NEWLIB}"
-    make install || exit
+    make ${PARALLEL}
+    install ${NEWLIB} install
     cd ..
     log "Cleaning up ${NEWLIB}"
     touch ${STAMPS}/${NEWLIB}.build
@@ -212,8 +217,7 @@ fi
 
 # Yes, you need to build gcc again!
 if [ ! -e ${STAMPS}/${GCC}.build ]; then
-    log "Unpacking ${GCC}"
-    unpack ${SOURCES}/${GCC}.tar.bz2
+    unpack ${GCC}
     cd build
     log "Configuring ${GCC}"
     ../${GCC}/configure --target=${TARGET} \
@@ -227,11 +231,10 @@ if [ ! -e ${STAMPS}/${GCC}.build ]; then
                       --with-gnu-ld \
                      --disable-nls \
                       --disable-werror \
-                    ${GCCFLAGS} || exit
+                    ${GCCFLAGS}
     log "Building ${GCC}"
-    make ${PARALLEL} || exit
-    log "Installing ${GCC}"
-    make install || exit
+    make ${PARALLEL}
+    install ${GCC} install
     cd ..
     log "Cleaning up ${GCC}"
     touch ${STAMPS}/${GCC}.build
@@ -239,8 +242,7 @@ if [ ! -e ${STAMPS}/${GCC}.build ]; then
 fi
 
 if [ ! -e ${STAMPS}/${GDB}.build ]; then
-    log "Unpacking ${GDB}"
-    unpack ${SOURCES}/${GDB}.tar.bz2
+    unpack ${GDB}
     cd build
     log "Configuring ${GDB}"
     ../${GDB}/configure --target=${TARGET} \
@@ -248,11 +250,10 @@ if [ ! -e ${STAMPS}/${GDB}.build ]; then
                       --enable-interwork \
                       --enable-multilib \
                       --disable-werror \
-                     ${GDBFLAGS} || exit
+                     ${GDBFLAGS}
     log "Building ${GDB}"
-    make ${PARALLEL} || exit
-    log "Installing ${GDB}"
-    make install || exit
+    make ${PARALLEL}
+    install ${GDB} install
     cd ..
     log "Cleaning up ${GDB}"
     touch ${STAMPS}/${GDB}.build
@@ -261,13 +262,11 @@ fi
 
 if [ ${LIBSTM32_EN} != 0 ]; then
 if [ ! -e .libcmsis-${LIBCMSIS}.build ]; then
-    log "Unpacking libcmsis-${LIBCMSIS}"
-    unpack ${SOURCES}/libcmsis-${LIBCMSIS}.tar.bz2
+    unpack libcmsis-${LIBCMSIS}
     cd libcmsis-${LIBCMSIS}
     log "Building libcmsis-${LIBCMSIS}"
-    make arch_prefix=${TARGET} prefix=${PREFIX} || exit
-    log "Installing libcmsis-${LIBCMSIS}"
-    make arch_prefix=${TARGET} prefix=${PREFIX} install || exit
+    make arch_prefix=${TARGET} prefix=${PREFIX}
+    install libcmsis-${LIBCMSIS} arch_prefix=${TARGET} prefix=${PREFIX} install
     cd ..
     log "Cleaning up libcmsis-${LIBCMSIS}"
     touch .libcmsis-${LIBCMSIS}.build
@@ -275,13 +274,11 @@ if [ ! -e .libcmsis-${LIBCMSIS}.build ]; then
 fi
 
 if [ ! -e .libstm32-${LIBSTM32}.build ]; then
-    log "Unpacking libstm32-${LIBSTM32}"
-    unpack ${SOURCES}/libstm32-${LIBSTM32}.tar.bz2
+    unpack libstm32-${LIBSTM32}
     cd libstm32-${LIBSTM32}
     log "Building libstm32-${LIBSTM32}"
-    make arch_prefix=${TARGET} prefix=${PREFIX} || exit
-    log "Installing libstm32-${LIBSTM32}"
-    make arch_prefix=${TARGET} prefix=${PREFIX} install || exit
+    make arch_prefix=${TARGET} prefix=${PREFIX}
+    install libstm32-${LIBSTM32} arch_prefix=${TARGET} prefix=${PREFIX} install
     cd ..
     log "Cleaning up libstm32-${LIBSTM32}"
     touch .libstm32-${LIBSTM32}.build
@@ -289,13 +286,11 @@ if [ ! -e .libstm32-${LIBSTM32}.build ]; then
 fi
 
 if [ ! -e .libstm32usb-${LIBSTM32USB}.build ]; then
-    log "Unpacking libstm32usb-${LIBSTM32USB}"
-    unpack ${SOURCES}/libstm32usb-${LIBSTM32USB}.tar.bz2
+    unpack libstm32usb-${LIBSTM32USB}
     cd libstm32usb-${LIBSTM32USB}
     log "Building libstm32usb-${LIBSTM32USB}"
-    make arch_prefix=${TARGET} prefix=${PREFIX} || exit
-    log "Installing libstm32usb-${LIBSTM32USB}"
-    make arch_prefix=${TARGET} prefix=${PREFIX} install || exit
+    make arch_prefix=${TARGET} prefix=${PREFIX}
+    install libstm32usb-${LIBSTM32USB} arch_prefix=${TARGET} prefix=${PREFIX} install
     cd ..
     log "Cleaning up libstm32usb-${LIBSTM32USB}"
     touch .libstm32usb-${LIBSTM32USB}.build
@@ -304,13 +299,11 @@ fi
 fi
 
 if [ $LIBOPENSTM32_EN != 0 ]; then
-    log "Unpacking libopenstm32-${LIBOPENSTM32}"
-    unpack ${SOURCES}/libopenstm32-${LIBOPENSTM32}.tar.bz2
+    unpack libopenstm32-${LIBOPENSTM32}
     cd libopenstm32-${LIBOPENSTM32}
     log "Building libopenstm32-${LIBOPENSTM32}"
-    make PREFIX=${TARGET} DESTDIR=${PREFIX} || exit
-    log "Installing libopenstm32-${LIBOPENSTM32}"
-    make PREFIX=${TARGET} DESTDIR=${PREFIX} install || exit
+    make PREFIX=${TARGET} DESTDIR=${PREFIX}
+    install libopenstm32-${LIBOPENSTM32} PREFIX=${TARGET} DESTDIR=${PREFIX} install
     cd ..
     log "Cleaning up libopenstm32-${LIBOPENSTM32}"
     touch .libopenstm32-${LIBOPENSTM32}.build