ooo-build r15459 - in branches/ooo-build-3-0-1: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Mar  4 12:36:20 2009
New Revision: 15459
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15459&view=rev

Log:
2009-03-04  Rene Engelhard  <rene debian org>

        * patches/dev300/config_office-openjdk-paths-mips.diff: OpenJDK
          has mipsel as its dir, not mips32



Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/config_office-openjdk-paths.diff

Modified: branches/ooo-build-3-0-1/patches/dev300/config_office-openjdk-paths.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/config_office-openjdk-paths.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/config_office-openjdk-paths.diff	Wed Mar  4 12:36:20 2009
@@ -76,6 +76,20 @@
        $EPM_FLAGS      = "-a arm";
     }
     elsif ($platform =~ m/^mips/)
+@@ -564,12 +564,7 @@
+       else {
+         if ('@WORDS_BIGENDIAN@' ne 'yes') {
+           $EPM_FLAGS = "-a mipsel";
+-          if ( $JDK eq "gcj" ) {
+-	    $ARCH = "mipsel";
+-          }
+-          else {
+-	    $ARCH = "mips32";
+-          }
++	  $ARCH = "mipsel";
+         }
+         else {
+           $ARCH = "mips";
 @@ -577,10 +588,18 @@
          }
        }