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

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Mar 23 00:08:43 2009
New Revision: 15596
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15596&view=rev

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

        * patches/dev300/apply,
          patches/dev300/openjdk-powerpc-server.diff: fix build with ppc and OpenJDK
          again


Added:
   trunk/patches/dev300/openjdk-powerpc-server.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Mar 23 00:08:43 2009
@@ -1219,6 +1219,9 @@
 # allow to use the prebuilt jsr173_1.0_api.jar
 build-prebuilt-stax.diff, i#93116, pmladek
 
+# powerpcs OpenJDK needs sever, not client
+openjdk-powerpc-server.diff, i#100468
+
 [ BuildBits < dev300-m44 < ooo310-m5 ]
 # fix MIPS build with OpenJDK
 config_office-openjdk-paths-mips.diff

Added: trunk/patches/dev300/openjdk-powerpc-server.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/openjdk-powerpc-server.diff	Mon Mar 23 00:08:43 2009
@@ -0,0 +1,11 @@
+--- set_soenv.in-old	2009-03-23 00:39:42.000000000 +0100
++++ set_soenv.in	2009-03-23 00:42:23.000000000 +0100
+@@ -478,7 +478,7 @@
+ 	 # OpenJDK
+ 	 elsif ($JDK =~ m/sun/) {
+ 	    $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+-	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
++	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."server";
+ 	    $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
+ 	    $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
+ 	 }