ooo-build r14751 - in branches/opensuse-11-1: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Fri Dec  5 11:38:37 2008
New Revision: 14751
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14751&view=rev

Log:
2008-12-05  Petr Mladek  <pmladek suse cz>

	* patches/dev300/config_office-openjdk-paths.diff: synced from
	  ooo-build-3-0 branch; should fix ppc, arm, and mips (bnc#449711)




Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/patches/dev300/config_office-openjdk-paths.diff

Modified: branches/opensuse-11-1/patches/dev300/config_office-openjdk-paths.diff
==============================================================================
--- branches/opensuse-11-1/patches/dev300/config_office-openjdk-paths.diff	(original)
+++ branches/opensuse-11-1/patches/dev300/config_office-openjdk-paths.diff	Fri Dec  5 11:38:37 2008
@@ -1,22 +1,14 @@
-? l
-? visibility.cxx
-? visibility.s
-Index: set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.194.2.5
-diff -u -r1.194.2.5 set_soenv.in
---- config_office/set_soenv.in	6 Aug 2008 14:07:08 -0000	1.194.2.5
-+++ config_office/set_soenv.in	24 Aug 2008 20:58:13 -0000
-@@ -399,6 +399,7 @@
-       else {
+--- config_office/set_soenv.in.orig	2008-11-23 17:30:18.000000000 +0000
++++ config_office/set_soenv.in	2008-11-23 17:31:10.000000000 +0000
+@@ -400,6 +400,7 @@
+       else {      
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
 +      # has both server and client
        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
        }
-@@ -420,6 +421,7 @@
+@@ -421,6 +422,7 @@
        $OUTPATH        = "unxlngx6";
        # Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
@@ -24,7 +16,7 @@
        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
-@@ -444,7 +446,8 @@
+@@ -445,8 +447,9 @@
        $CPUNAME        = "SPARC";
        $OUTPATH        = "unxlngs";
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
@@ -34,14 +26,15 @@
 +      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
     }
     elsif ($platform =~ m/^powerpc/)
-@@ -478,11 +478,18 @@
+    {
+@@ -478,11 +481,18 @@
              $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
              $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
           }
 +	 # 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";
 +	 }
@@ -54,7 +47,7 @@
        if ( "$JRELIBDIR" eq "" ) {
            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."bin";
            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
-@@ -505,7 +507,7 @@
+@@ -506,7 +516,7 @@
           $OUTPATH        = "unxlngs390";
        }
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
@@ -63,7 +56,7 @@
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."xawt";
        $CPU            = "3";
-@@ -529,7 +531,7 @@
+@@ -530,7 +540,7 @@
        $CPUNAME        = "ALPHA_";
        $OUTPATH        = "unxlnga";
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";
@@ -72,21 +65,37 @@
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
     }
     elsif ($platform =~ m/^arm.*?l-/)
-@@ -539,7 +541,7 @@
+@@ -540,8 +550,9 @@
        $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";
++      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."xawt";
        $EPM_FLAGS      = "-a arm";
     }
-@@ -577,7 +579,7 @@
+    elsif ($platform =~ m/^mips/)
+@@ -577,10 +588,18 @@
+         }
        }
-
-       $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
+ 
+-      $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";
+-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
+-      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
++      # OpenJDK
++      if ($JDK =~ m/sun/) {
++        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
++        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client";
++        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
++        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."xawt";
++      } else {
++        $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
++        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client";
++        $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
++        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
++      }
     }
+ 
+