ooo-build r14314 - in branches/ooo-build-2-4-1: . patches/src680

[ccheney svn gnome org]

Author: ccheney
Date: Wed Oct 15 04:52:20 2008
New Revision: 14314
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14314&view=rev

Log:
2008-10-14  Chris Cheney  <ccheney ubuntu com>

        * patches/src680/apply,
          patches/src680/config_office-openjdk-paths.diff:
          fix build with OpenJDK for !i386/amd64


Added:
   branches/ooo-build-2-4-1/patches/src680/config_office-openjdk-paths.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/apply

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Wed Oct 15 04:52:20 2008
@@ -1062,6 +1062,9 @@
 # fix the --enable-reportdesign configure check to work
 buildfix-enable-reportdesign-check.diff, i#87518, pmladek
 
+# OpenJDK paths for some archs
+config_office-openjdk-paths.diff, i91783
+
 [ NovellOnlyWin32 ]
 SectionOwner => tml
 

Added: branches/ooo-build-2-4-1/patches/src680/config_office-openjdk-paths.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/config_office-openjdk-paths.diff	Wed Oct 15 04:52:20 2008
@@ -0,0 +1,73 @@
+--- config_office/set_soenv.in	2008-09-30 02:52:20 +0000
++++ config_office/set_soenv.in	2008-09-30 03:25:39 +0000
+@@ -418,7 +418,7 @@
+       else {      
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+       }
+ 
+@@ -464,8 +464,9 @@
+       $CPUNAME        = "SPARC";
+       $OUTPATH        = "unxlngs";
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
++      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
+    }
+    elsif ($platform =~ m/^powerpc/)
+    {
+@@ -497,6 +498,13 @@
+             $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin";
+             $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."xawt";
+          }
++         else
++         {
++           $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
++           $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";
++         }
+       }
+ 
+       $CPU            = "P";
+@@ -515,7 +523,7 @@
+       $CPUNAME        = "S390";
+       $OUTPATH        = "unxlngs390";
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."s390";
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."s390".$ds."client";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."s390".$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."s390".$ds."native_threads";
+    }
+    elsif ($platform =~ m/^alpha/) 
+@@ -525,7 +533,7 @@
+       $CPUNAME        = "ALPHA_";
+       $OUTPATH        = "unxlnga";
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
+    }
+    elsif ($platform =~ m/^arm.*?l-/)
+@@ -535,7 +543,7 @@
+       $CPUNAME        = "ARM";
+       $OUTPATH        = "unxlngr";
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm";
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."client";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
+       $EPM_FLAGS      = "-a arm";
+    }
+@@ -573,7 +581,7 @@
+       }
+ 
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
+       $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
+    }
+