October 23, 2004 3:30 PM

ooo64bit02 is now resynced to SRC680_m57

Jens-Heiner Rechtien from Sun did a lot of work on resyncing ooo64bit02 child workspace to newer milestone from SRC680 (m57). Thanks.

I have just started build on my system to get it to the same state as it was before.

Update: module nas can not be compiled because patch doesn't apply. Copy nas-1.6.patch from SRC680_m58.

Use module jvmfwk from m58 with this patch applied:
Index: plugins/sunmajor/pluginlib/vendorbase.hxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx,v
retrieving revision 1.2
diff -u -r1.2 vendorbase.hxx
--- plugins/sunmajor/pluginlib/vendorbase.hxx   23 Jul 2004 11:53:12 -0000     1.2
+++ plugins/sunmajor/pluginlib/vendorbase.hxx   23 Oct 2004 18:00:16 -0000
@@ -83,6 +83,8 @@
 #define JFW_PLUGIN_ARCH "mips"
 #elif defined S390
 #define JFW_PLUGIN_ARCH "s390"
+#elif defined X86_64
+#define JFW_PLUGIN_ARCH "x86_64"
 #else // SPARC, INTEL, POWERPC, MIPS
 #error unknown plattform
 #endif // SPARC, INTEL, POWERPC, MIPS
-----

Posted by Pavel | Permanent link | File under: OpenOffice.org