ooo-build r15460 - in trunk: . patches/dev300

[rengelhard svn gnome org]

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

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

        * patches/dev300/openjdk-mips-server.diff: move ...
        * patches/dev300/config_office-openjdk-paths-mips.diff: here...
        * patches/dev300/apply: adapt

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


Added:
   trunk/patches/dev300/config_office-openjdk-paths-mips.diff
      - copied, changed from r15444, /trunk/patches/dev300/openjdk-mips-server.diff
Removed:
   trunk/patches/dev300/openjdk-mips-server.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Mar  4 12:37:25 2009
@@ -1185,7 +1185,7 @@
 build-prebuilt-stax.diff, i#93116, pmladek
 
 # fix MIPS build with OpenJDK
-openjdk-mips-server.diff
+config_office-openjdk-paths-mips.diff
 
 [ Java14 ]
 

Copied: trunk/patches/dev300/config_office-openjdk-paths-mips.diff (from r15444, /trunk/patches/dev300/openjdk-mips-server.diff)
==============================================================================
--- /trunk/patches/dev300/openjdk-mips-server.diff	(original)
+++ trunk/patches/dev300/config_office-openjdk-paths-mips.diff	Wed Mar  4 12:37:25 2009
@@ -1,5 +1,19 @@
 --- set_soenv.in	(Revision 268589)
 +++ set_soenv.in	(Arbeitskopie)
+@@ -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,7 +577,7 @@
        }