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

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Dec 29 18:23:50 2008
New Revision: 14951
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14951&view=rev

Log:
2008-12-29  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/build-ibm-java-enable-m37.diff:
	* patches/dev300/build-ibm-java-enable.diff:
	* patches/dev300/apply: adjusted for dev300-m38.



Added:
   trunk/patches/dev300/build-ibm-java-enable-m37.diff   (props changed)
      - copied unchanged from r14946, /trunk/patches/dev300/build-ibm-java-enable.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/build-ibm-java-enable.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Dec 29 18:23:50 2008
@@ -1181,9 +1181,15 @@
 # even worse, the direcotry had the rights 444
 installer-get-path-correctly.diff, pmladek
 
+[ BuildBits < dev300-m38 ]
+# enable build with IBM Java 1.6.0
+build-ibm-java-enable-m37.diff, i#93114, pmladek
+
+[ BuildBits >= dev300-m38 ]
 # enable build with IBM Java 1.6.0
 build-ibm-java-enable.diff, i#93114, pmladek
 
+[ BuildBits ]
 # allow to use the prebuilt jsr173_1.0_api.jar
 build-prebuilt-stax.diff, i#93116, pmladek
 

Modified: trunk/patches/dev300/build-ibm-java-enable.diff
==============================================================================
--- trunk/patches/dev300/build-ibm-java-enable.diff	(original)
+++ trunk/patches/dev300/build-ibm-java-enable.diff	Mon Dec 29 18:23:50 2008
@@ -1,6 +1,8 @@
---- config_office/configure.in.old	2008-08-21 14:12:56.000000000 +0200
-+++ config_office/configure.in	2008-08-21 14:32:41.747947642 +0200
-@@ -2791,25 +2791,24 @@ if test "$SOLAR_JAVA" != ""; then
+diff --git config_office/configure.in config_office/configure.in
+index 3ac1154..05d4723 100644
+--- config_office/configure.in
++++ config_office/configure.in
+@@ -2683,25 +2683,24 @@ if test "$SOLAR_JAVA" != ""; then
  #        JAVA_HOME=$with_jdk_home
  #
        elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "IBM"` -gt 0; then
@@ -44,9 +46,11 @@
  	
        else	
          JDK=sun
---- config_office/set_soenv.in.old	2008-08-22 10:33:51.000000000 +0200
-+++ config_office/set_soenv.in	2008-08-22 20:41:23.990263078 +0200
-@@ -473,17 +473,17 @@ elsif ( $platform =~ m/linux/ ) 
+diff --git config_office/set_soenv.in config_office/set_soenv.in
+index 9de3aa9..15af59d 100644
+--- config_office/set_soenv.in
++++ config_office/set_soenv.in
+@@ -473,10 +473,10 @@ elsif ( $platform =~ m/linux/ )
              $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
              $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
           elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
@@ -59,14 +63,5 @@
 +            $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
 +            $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
           }
-       }
- 
-       $CPU            = "P";
- 
--# the "standard" ppc j2sdk is IBMJava2-ppc-142
--      if ( $JDK ne "gcj" ) {
-+      # fallback
-+      if ( "$JRELIBDIR" eq "" ) {
-           $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."bin";
-           $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
-           $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."bin";
+          else { 
+ 	    # OpenJDK (aka JDK=sun)