ooo-build r14159 - in branches/ooo-build-3-0: . bin

[strba svn gnome org]

Author: strba
Date: Tue Sep 30 15:13:37 2008
New Revision: 14159
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14159&view=rev

Log:
fix binutils unpacking

Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/bin/setup.in
   branches/ooo-build-3-0/bin/unpack

Modified: branches/ooo-build-3-0/bin/setup.in
==============================================================================
--- branches/ooo-build-3-0/bin/setup.in	(original)
+++ branches/ooo-build-3-0/bin/setup.in	Tue Sep 30 15:13:37 2008
@@ -209,7 +209,7 @@
 BINUTILS_TARBALL=binutils-2.18.tar.bz2
 BINUTILS_UNTAR_OPTIONS=jxf
 BINUTILS_DECOMPRESS_CMD="bzip2 -dc"
-BINUTILS_PATCH=
+BINUTILS_PATCHES=""
 
 OOO_SCALED_ICONS_VER=ooo-scaled-icons
 OOO_SCALED_ICONS_TARBALL=$OOO_SCALED_ICONS_VER.tar.gz

Modified: branches/ooo-build-3-0/bin/unpack
==============================================================================
--- branches/ooo-build-3-0/bin/unpack	(original)
+++ branches/ooo-build-3-0/bin/unpack	Tue Sep 30 15:13:37 2008
@@ -157,12 +157,14 @@
     echo "Unpacking compiler bits"
 
     if test "z$BINUTILS_TARBALL" != "z"; then
-	($BINUTILS_DECOMPRESS_CMD $SRCDIR/$BINUTILS_TARBALL | $GNUTAR xpf - ) || exit 1;
-	patch -p0 < $BINUTILS_PATCH || exit 1;
+        ($BINUTILS_DECOMPRESS_CMD $SRCDIR/$BINUTILS_TARBALL | $GNUTAR xpf - ) || exit 1;
+        for P in $BINUTILS_PATCHES ; do
+            patch -d "$BINUTILS_VER" -p1 -s < "$SRCDIR/$P"
+        done
     fi
     ($GCC_DECOMPRESS_CMD $SRCDIR/$GCC_TARBALL | $GNUTAR xpf - ) || exit 1;
     for P in $GCC_PATCHES ; do
-	patch -d "$GCC_VER" -p1 -s < "$SRCDIR/$P"
+        patch -d "$GCC_VER" -p1 -s < "$SRCDIR/$P"
     done
 fi