diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-03-23 17:11:40 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-03-23 17:11:40 +0000 |
| commit | f9e4d4ba6946599ebac5b42ce416562e752c5d91 (patch) | |
| tree | 15025fa61a4799cfa733578fa3a3ab0fbefb1d59 /editors/openoffice.org-3-RC | |
| parent | Use REINPLACE_CMD. (diff) | |
We use the linux jdk now to build, so follow the linux if-clauses here.
Notes
Notes:
svn path=/head/; revision=77274
Diffstat (limited to 'editors/openoffice.org-3-RC')
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-source+javavm+interact.cxx | 11 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+javavm.cxx | 29 |
2 files changed, 40 insertions, 0 deletions
diff --git a/editors/openoffice.org-3-RC/files/patch-source+javavm+interact.cxx b/editors/openoffice.org-3-RC/files/patch-source+javavm+interact.cxx new file mode 100644 index 000000000000..3b138eaaff50 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-source+javavm+interact.cxx @@ -0,0 +1,11 @@ +--- ../stoc/source/javavm/interact.cxx.orig Fri Mar 21 11:58:45 2003 ++++ ../stoc/source/javavm/interact.cxx Fri Mar 21 12:01:18 2003 +@@ -129,7 +129,7 @@ + m_aRequest(rRequest) + { + bool bRetry; +-#if defined LINUX ++#if defined LINUX || defined FREEBSD + // Only if Java is disabled we allow retry: + bRetry = m_aRequest.isExtractableTo( + getCppuType(static_cast< css::java::JavaDisabledException * >(0))); diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+javavm.cxx b/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+javavm.cxx new file mode 100644 index 000000000000..a0796522b4c8 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+javavm.cxx @@ -0,0 +1,29 @@ +--- ../stoc/source/javavm/javavm.cxx.orig Fri Mar 21 12:03:58 2003 ++++ ../stoc/source/javavm/javavm.cxx Fri Mar 21 12:04:24 2003 +@@ -1097,7 +1097,7 @@ + static_cast< + css::java::JavaNotConfiguredException * >(0)))) + { +-#if defined LINUX ++#if defined LINUX || defined FREEBSD + // Because of LD_LIBRARY_PATH, even javaldx --use-links does + // not work sometimes: + m_bDontCreateJvm = true; +@@ -1109,7 +1109,7 @@ + css::java::MissingJavaRuntimeException * >( + 0)))) + { +-#if defined LINUX ++#if defined LINUX || defined FREEBSD + // Because of LD_LIBRARY_PATH, even javaldx --use-links does + // not work sometimes: + m_bDontCreateJvm = true; +@@ -1596,7 +1596,7 @@ + // On linux we load jvm with RTLD_GLOBAL. This is necessary for debugging, because + // libjdwp.so need a symbol (fork1) from libjvm which it only gets if the jvm is loaded + // witd RTLD_GLOBAL. On Solaris libjdwp.so is correctly linked with libjvm.so +-#ifdef LINUX ++#ifdef LINUX || defined FREEBSD + if(!m_aJavaLib.load(jvm.getRuntimeLib(), SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_NOW)) + #else + if(!m_aJavaLib.load(jvm.getRuntimeLib())) |