cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We use the linux jdk now to build, so follow the linux if-clauses here.

Browse Source
This commit is contained in:
Martin Blapp 2003-03-23 17:11:40 +00:00
parent 873536d51c
commit f9e4d4ba69
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=77274
34 changed files with 680 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editors/openoffice-1.1-devel/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice-1.1-devel/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice-1.1/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice-1.1/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice-2.0-devel/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice-2.0-devel/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice-3-devel/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice-3-devel/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice-3/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice-3/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice-devel/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice-devel/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice.org-1.1-devel/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice.org-1.1-devel/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice.org-1.1/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice.org-1.1/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice.org-2-RC/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice.org-2-RC/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice.org-2-devel/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice.org-2-devel/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice.org-2.0-devel/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice.org-2.0-devel/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice.org-2.0/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice.org-2.0/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice.org-2/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice.org-2/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice.org-3-RC/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice.org-3-RC/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice.org-3-devel/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice.org-3-devel/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice.org-3/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice.org-3/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))

11
editors/openoffice.org-vcltesttool/files/patch-source+javavm+interact.cxx Normal file
View File

@ -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)));

29
editors/openoffice.org-vcltesttool/files/patch-stoc+source+javavm+javavm.cxx Normal file
View File

@ -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()))