From c4e066dc0a91bcc03cea98045a9d4ff0b8367b11 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Tue, 30 May 2006 23:14:16 +0000 Subject: [PATCH] added libmirko to build process --- build-devkit.sh | 19 +++++++++++++++++-- dkarm-eabi/scripts/build-crtls.sh | 8 +++++++- dkarm/scripts/build-crtls.sh | 6 ++++++ dkppc/scripts/build-gcc.sh | 18 +++++++++++------- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/build-devkit.sh b/build-devkit.sh index b8ad3a6..4262ae1 100644 --- a/build-devkit.sh +++ b/build-devkit.sh @@ -12,6 +12,7 @@ NEWLIB_VER=1.14.0 LIBOGC_VER=20050812 LIBGBA_VER=20060518 LIBNDS_VER=20060518 +LIBMIRKO_VER=0.9.6 ELF2FLT_VER=20060506 BINUTILS="binutils-$BINUTILS_VER.tar.bz2" @@ -21,6 +22,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" +LIBNDS="libmirko-src-$LIBMIRKO_VER.tar.bz2" ELF2FLT="elf2flt-src-$ELF2FLT_VER.tar.bz2" SFMIRROR="jaist" @@ -30,6 +32,7 @@ GCC_GPP_URL="http://ftp.gnu.org/gnu/gcc/gcc-$GCC_VER/$GCC_GPP" 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_URL="ftp://sources.redhat.com/pub/newlib/$NEWLIB" @@ -199,6 +202,13 @@ then else FOUND=1 fi + if [ ! -f $SRCDIR/$LIBMIRKO ] + then + echo "Error: $LIBMIRKO not found in $SRCDIR" + exit + else + FOUND=1 + fi if [ ! -f $SRCDIR/$ELF2FLT ] then echo "Error: $ELF2FLT not found in $SRCDIR" @@ -242,6 +252,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 $LIBMIRKO_URL || { echo "Error: Failed to download "$LIBMIRKO; exit; } $WGET -c $ELF2FLT_URL || { echo "Error: Failed to download "$ELF2FLT; exit; } fi SRCDIR=`pwd` @@ -253,6 +264,7 @@ NEWLIB_SRCDIR="newlib-$NEWLIB_VER" LIBOGC_SRCDIR="libogc-$LIBOGC_VER" LIBGBA_SRCDIR="libgba-$LIBGBA_VER" LIBNDS_SRCDIR="libnds-$LIBNDS_VER" +LIBMIRKO_SRCDIR="libmirko-$LIBMIRKO_VER" #--------------------------------------------------------------------------------- # Add installed devkit to the path, adjusting path on minsys @@ -293,7 +305,7 @@ scriptdir=$(pwd)/$basedir/scripts BUILDSCRIPTDIR=$(pwd) echo "Extracting $BINUTILS" -#tar -xjvf $SRCDIR/$BINUTILS || { echo "Error extracting "$BINUTILS; exit; } +tar -xjvf $SRCDIR/$BINUTILS || { echo "Error extracting "$BINUTILS; exit; } echo "Extracting $GCC_CORE" tar -xjvf $SRCDIR/$GCC_CORE || { echo "Error extracting "$GCC_CORE; exit; } @@ -320,8 +332,11 @@ then echo "Extracting $LIBGBA" mkdir -p $LIBGBA_SRCDIR bzip2 -cd $SRCDIR/$LIBGBA | tar -xv -C $LIBGBA_SRCDIR || { echo "Error extracting "$LIBGBA; exit; } + 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; } +# tar -xjvf $SRCDIR/$ELF2FLT || { echo "Error extracting "$ELF2FLT; exit; } fi diff --git a/dkarm-eabi/scripts/build-crtls.sh b/dkarm-eabi/scripts/build-crtls.sh index 21ecd2d..059950d 100644 --- a/dkarm-eabi/scripts/build-crtls.sh +++ b/dkarm-eabi/scripts/build-crtls.sh @@ -30,8 +30,14 @@ cp dkarm-eabi/rules/* $DEVKITARM cd $LIBNDS_SRCDIR echo "building libnds ..." $MAKE install INSTALLDIR=$TOOLPATH +cd $BUILDSCRIPTDIR echo "building libgba ..." -cd $BUILDSCRIPTDIR cd $LIBGBA_SRCDIR $MAKE install INSTALLDIR=$TOOLPATH +cd $BUILDSCRIPTDIR + +echo "building libmirko ..." +cd $LIBMIRKO_SRCDIR +$MAKE install INSTALLDIR=$TOOLPATH +cd $BUILDSCRIPTDIR diff --git a/dkarm/scripts/build-crtls.sh b/dkarm/scripts/build-crtls.sh index bdae9a7..b685bbb 100644 --- a/dkarm/scripts/build-crtls.sh +++ b/dkarm/scripts/build-crtls.sh @@ -35,3 +35,9 @@ echo "building libgba ..." cd $BUILDSCRIPTDIR cd $LIBGBA_SRCDIR $MAKE install INSTALLDIR=$TOOLPATH +cd $BUILDSCRIPTDIR + +echo "building libmirko ..." +cd $LIBMIRKO_SRCDIR +$MAKE install INSTALLDIR=$TOOLPATH +cd $BUILDSCRIPTDIR diff --git a/dkppc/scripts/build-gcc.sh b/dkppc/scripts/build-gcc.sh index 5b66f2d..0b59427 100644 --- a/dkppc/scripts/build-gcc.sh +++ b/dkppc/scripts/build-gcc.sh @@ -14,7 +14,7 @@ cd $target/binutils ../../$BINUTILS_SRCDIR/configure \ --prefix=$prefix --target=$target --disable-nls --disable-shared --disable-debug \ - --with-gcc --with-gnu-as --with-gnu-ld --with-stabs \ + --with-gcc --with-gnu-as --with-gnu-ld \ || { echo "Error configuing ppc binutils"; exit 1; } @@ -37,14 +37,17 @@ cd mn10200/binutils ../../$BINUTILS_SRCDIR/configure \ --prefix=$prefix --target=mn10200 --disable-nls --disable-shared --disable-debug \ - --with-gcc --with-gnu-as --with-gnu-ld --with-stabs \ + --with-gcc --with-gnu-as --with-gnu-ld \ || { echo "Error configuing mn10200 binutils"; exit 1; } $MAKE || { echo "Error building mn10200 binutils"; exit 1; } $MAKE install || { echo "Error installing mn10200 binutils"; exit 1; } -strip $INSTALLDIR/devkitPPC/mn10200/bin/* +for f in $INSTALLDIR/devkitPPC/mn10200/bin/* +do + strip $f +done cd $BUILDSCRIPTDIR @@ -87,10 +90,11 @@ mkdir -p $target/newlib cd $target/newlib mkdir -p etc -$BUILDSCRIPTDIR/$NEWLIB_SRCDIR/configure --target=$target \ - --prefix=$prefix \ - --disable-debug \ - || { echo "Error configuring newlib"; exit 1; } +$BUILDSCRIPTDIR/$NEWLIB_SRCDIR/configure \ + --target=$target \ + --prefix=$prefix \ + --disable-debug \ + || { echo "Error configuring newlib"; exit 1; } $MAKE || { echo "Error building newlib"; exit 1; } $MAKE install || { echo "Error installing newlib"; exit 1; }