diff --git a/build-devkit.sh b/build-devkit.sh index 23af2a2..67c02ec 100755 --- a/build-devkit.sh +++ b/build-devkit.sh @@ -55,17 +55,7 @@ function extract_and_patch { #--------------------------------------------------------------------------------- if [ ! -f extracted-$1 ]; then echo "extracting $1" - if [ $3 == "bz2" ]; then - extractflags="-xjf" - archivetype=".tar.bz2" - elif [ $3 == "gz" ]; then - extractflags="-xzf" - archivetype=".tar.gz" - else - echo "invalid archive type" - exit 1 - fi - tar $extractflags "$SRCDIR/$1-$2$archivetype" || { echo "Error extracting "$1; exit 1; } + tar -xf "$SRCDIR/$1-$2.tar.$3" || { echo "Error extracting "$1; exit 1; } touch extracted-$1 fi if [[ ! -f patched-$1 && -f $patchdir/$1-$2.patch ]]; then @@ -191,7 +181,7 @@ DEVKITPRO_URL="http://downloads.sourceforge.net/devkitpro" patchdir=$(pwd)/$basedir/patches scriptdir=$(pwd)/$basedir/scripts -archives="binutils-${BINUTILS_VER}.tar.bz2 gcc-${GCC_VER}.tar.bz2 newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.bz2" +archives="binutils-${BINUTILS_VER}.tar.bz2 gcc-${GCC_VER}.tar.bz2 newlib-${NEWLIB_VER}.tar.gz gdb-${GDB_VER}.tar.xz" if [ $VERSION -eq 1 ]; then @@ -243,7 +233,7 @@ extract_and_patch binutils $BINUTILS_VER bz2 extract_and_patch gcc $GCC_VER bz2 rm -fr gcc-$GCC_VER/zlib extract_and_patch newlib $NEWLIB_VER gz -extract_and_patch gdb $GDB_VER bz2 +extract_and_patch gdb $GDB_VER xz for archive in $targetarchives do diff --git a/dkppc/patches/gdb-7.10.patch b/dkppc/patches/gdb-7.11.patch similarity index 100% rename from dkppc/patches/gdb-7.10.patch rename to dkppc/patches/gdb-7.11.patch diff --git a/select_toolchain.sh b/select_toolchain.sh index f1974b8..f080c9a 100755 --- a/select_toolchain.sh +++ b/select_toolchain.sh @@ -43,7 +43,7 @@ case "$VERSION" in GCC_VER=5.3.0 BINUTILS_VER=2.25.1 NEWLIB_VER=2.0.0 - GDB_VER=7.10 + GDB_VER=7.11 basedir='dkppc' package=devkitPPC target=powerpc-eabi