diff --git a/build-devkit.sh b/build-devkit.sh index 69b3c6b..e451eb3 100644 --- a/build-devkit.sh +++ b/build-devkit.sh @@ -10,20 +10,17 @@ LIBOGC_VER=20050812 LIBGBA_VER=20060720 LIBNDS_VER=20060719 LIBMIRKO_VER=0.9.6 -ELF2FLT_VER=20060506 LIBOGC="libogc-src-$LIBOGC_VER.tar.bz2" LIBGBA="libgba-src-$LIBGBA_VER.tar.bz2" LIBNDS="libnds-src-$LIBNDS_VER.tar.bz2" LIBMIRKO="libmirko-src-$LIBMIRKO_VER.tar.bz2" -ELF2FLT="elf2flt-src-$ELF2FLT_VER.tar.bz2" SFMIRROR="jaist" LIBOGC_URL="http://$SFMIRROR.dl.sourceforge.net/sourceforge/devkitpro/$LIBOGC" LIBGBA_URL="http://$SFMIRROR.dl.sourceforge.net/sourceforge/devkitpro/$LIBGBA" LIBNDS_URL="http://$SFMIRROR.dl.sourceforge.net/sourceforge/devkitpro/$LIBNDS" LIBMIRKO_URL="http://$SFMIRROR.dl.sourceforge.net/sourceforge/devkitpro/$LIBMIRKO" -ELF2FLT_URL="http://$SFMIRROR.dl.sourceforge.net/sourceforge/devkitpro/$ELF2FLT" NEWLIB_VER=1.14.0 @@ -212,13 +209,6 @@ then else FOUND=1 fi - if [ ! -f $SRCDIR/$ELF2FLT ] - then - echo "Error: $ELF2FLT not found in $SRCDIR" - exit - else - FOUND=1 - fi fi if [ $VERSION -eq 2 ] @@ -256,7 +246,6 @@ else $WGET -c $LIBNDS_URL || { echo "Error: Failed to download "$LIBNDS; exit; } $WGET -c $LIBGBA_URL || { echo "Error: Failed to download "$LIBGBA; exit; } $WGET -c $LIBMIRKO_URL || { echo "Error: Failed to download "$LIBMIRKO; exit; } - $WGET -c $ELF2FLT_URL || { echo "Error: Failed to download "$ELF2FLT; exit; } fi SRCDIR=`pwd` fi @@ -338,8 +327,6 @@ then echo "Extracting $LIBMIRKO" mkdir -p $LIBMIRKO_SRCDIR bzip2 -cd $SRCDIR/$LIBMIRKO | tar -xv -C $LIBMIRKO_SRCDIR || { echo "Error extracting "$LIBMIRKO; exit; } - echo "Extracting $ELF2FLT" - tar -xjvf $SRCDIR/$ELF2FLT || { echo "Error extracting "$ELF2FLT; exit; } fi diff --git a/dkarm-eabi/patches/gcc-4.1.1.patch b/dkarm-eabi/patches/gcc-4.1.1.patch index ee570b6..0fff453 100644 --- a/dkarm-eabi/patches/gcc-4.1.1.patch +++ b/dkarm-eabi/patches/gcc-4.1.1.patch @@ -120,7 +120,7 @@ diff -Nbaur gcc-4.1.1/gcc/version.c gcc-4.1.1-arm/gcc/version.c the revision of your modified compiler. */ -#define VERSUFFIX "" -+#define VERSUFFIX " (devkitARM release 20)" ++#define VERSUFFIX " (devkitARM release 19c)" /* This is the location of the online document giving instructions for reporting bugs. If you distribute a modified version of GCC, diff --git a/dkarm-eabi/scripts/build-gcc.sh b/dkarm-eabi/scripts/build-gcc.sh index 19b48d8..960a4b2 100644 --- a/dkarm-eabi/scripts/build-gcc.sh +++ b/dkarm-eabi/scripts/build-gcc.sh @@ -20,25 +20,6 @@ cd $target/binutils $MAKE || { echo "Error building binutils"; exit 1; } $MAKE install || { echo "Error installing binutils"; exit 1; } -cd $BUILDSCRIPTDIR - -#--------------------------------------------------------------------------------- -# build and install elf2flt -#--------------------------------------------------------------------------------- -mkdir -p $target/elf2flt -cd $target/elf2flt - -../../elf2flt/configure \ - --prefix=$prefix --target=$target \ - --with-libbfd=../binutils/bfd/libbfd.a \ - --with-libiberty=../binutils/libiberty/libiberty.a \ - --with-bfd-include-dir=../binutils/bfd/ \ - --with-binutils-include-dir=../../$BINUTILS_SRCDIR/include/ \ - || { echo "Error configuring elf2flt"; exit 1; } - $MAKE || { echo "Error building elf2flt"; exit 1; } - $MAKE install || { echo "Error installing elf2flt"; exit 1; } - - cd $BUILDSCRIPTDIR #--------------------------------------------------------------------------------- @@ -46,8 +27,6 @@ cd $BUILDSCRIPTDIR #--------------------------------------------------------------------------------- rm -fr $target/binutils rm -fr $BINUTILS_SRCDIR -rm -fr $target/elf2flt -rm -fr elf2flt #--------------------------------------------------------------------------------- # build and install just the c compiler