From 13c832ff4281868e252eeff50ccab226af9e1f60 Mon Sep 17 00:00:00 2001
From: Dave Murphy <wntrmute@users.sourceforge.net>
Date: Mon, 10 Apr 2006 02:44:06 +0000
Subject: [PATCH] added elf2flt in the mix

---
 build-devkit.sh            | 25 +++++++++++++++++++++----
 dkarm/scripts/build-gcc.sh | 21 +++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/build-devkit.sh b/build-devkit.sh
index be51deb..9bd2022 100644
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -12,7 +12,7 @@ NEWLIB_VER=1.14.0
 LIBOGC_VER=20050812
 LIBGBA_VER=20060209
 LIBNDS_VER=20060201
-
+ELF2FLT_VER=20060410
 
 BINUTILS="binutils-$BINUTILS_VER.tar.bz2"
 GCC_CORE="gcc-core-$GCC_VER.tar.bz2"
@@ -21,6 +21,7 @@ NEWLIB="newlib-$NEWLIB_VER.tar.gz"
 LIBOGC="libogc-src-$LIBOGC_VER.tar.bz2"
 LIBGBA="libgba-src-$LIBGBA_VER.tar.bz2"
 LIBNDS="libnds-src-$LIBNDS_VER.tar.bz2"
+ELF2FLT="elf2flt-src-$ELF2FLT_VER.tar.bz2"
 
 BINUTILS_URL="http://ftp.gnu.org/gnu/binutils/$BINUTILS"
 GCC_CORE_URL="http://ftp.gnu.org/gnu/gcc/gcc-$GCC_VER/$GCC_CORE"
@@ -28,6 +29,7 @@ GCC_GPP_URL="http://ftp.gnu.org/gnu/gcc/gcc-$GCC_VER/$GCC_GPP"
 LIBOGC_URL="http://osdn.dl.sourceforge.net/sourceforge/devkitpro/$LIBOGC"
 LIBGBA_URL="http://osdn.dl.sourceforge.net/sourceforge/devkitpro/$LIBGBA"
 LIBNDS_URL="http://osdn.dl.sourceforge.net/sourceforge/devkitpro/$LIBNDS"
+ELF2FLT_URL="http://osdn.dl.sourceforge.net/sourceforge/devkitpro/$ELF2FLT"
 NEWLIB_URL="ftp://sources.redhat.com/pub/newlib/$NEWLIB"
 
 #---------------------------------------------------------------------------------
@@ -187,6 +189,13 @@ 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 ]
@@ -223,6 +232,7 @@ else
 	then
 		$WGET -c $LIBNDS_URL || { echo "Error: Failed to download "$LIBNDS; exit; }
 		$WGET -c $LIBGBA_URL || { echo "Error: Failed to download "$LIBGBA; exit; }
+		$WGET -c $ELF2FLT_URL || { echo "Error: Failed to download "$ELF2FLT; exit; }
 	fi
 	SRCDIR=`pwd`
 fi
@@ -300,6 +310,8 @@ then
   echo "Extracting $LIBGBA"
   mkdir -p $LIBGBA_SRCDIR
   bzip2 -cd $SRCDIR/$LIBGBA | tar -xv -C $LIBGBA_SRCDIR || { echo "Error extracting "$LIBGBA; exit; }
+  echo "Extracting $NEWLIB"
+  tar -xjvf $SRCDIR/$ELF2FLT || { echo "Error extracting "$ELF2FLT; exit; }
 fi
 
 
@@ -336,10 +348,15 @@ if [ -f $scriptdir/build-tools.sh ]; then . $scriptdir/build-tools.sh || { echo
 
 #---------------------------------------------------------------------------------
 # strip binaries
+# strip has trouble using wildcards so do it this way instead
 #---------------------------------------------------------------------------------
-strip $INSTALLDIR/$package/bin/*
-strip $INSTALLDIR/$package/$target/bin/*
-strip $INSTALLDIR/$package/libexec/gcc/$target/$GCC_VER/*
+for f in	$INSTALLDIR/$package/bin/* \
+		$INSTALLDIR/$package/$target/bin/* \
+		$INSTALLDIR/$package/libexec/gcc/$target/$GCC_VER/*
+do
+	strip $f
+done
+
 rm -fr $INSTALLDIR/$package/include/c++/$GCC_VER/$target/bits/stdc++.h.gch
 
 #---------------------------------------------------------------------------------
diff --git a/dkarm/scripts/build-gcc.sh b/dkarm/scripts/build-gcc.sh
index fafa921..643bda1 100644
--- a/dkarm/scripts/build-gcc.sh
+++ b/dkarm/scripts/build-gcc.sh
@@ -20,6 +20,25 @@ 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
 
 #---------------------------------------------------------------------------------
@@ -27,6 +46,8 @@ cd $BUILDSCRIPTDIR
 #---------------------------------------------------------------------------------
 rm -fr $target/binutils
 rm -fr $BINUTILS_SRCDIR
+rm -fr $target/elf2flt
+rm -fr elf2flt
 
 #---------------------------------------------------------------------------------
 # build and install just the c compiler