. On amd64 the plugin should look for the Server VM, since there is no

  Client VM.

Submitted by:	Kurt Miller <kurt@intricatesoftware.com>

6 files changed, 90 insertions, 0 deletions

diff --git a/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp b/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
new file mode 100644
index 000000000000..78d8d258832f
--- /dev/null
+++ b/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
@@ -0,0 +1,16 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp.orig	Tue Oct 19 15:04:42 2004
++++ ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp	Thu Jul  6 17:09:36 2006
+@@ -305,7 +305,11 @@
+     char * jre = m_ltstate->java_dir;
+     
+     // ARCH is passed in on the compile line
++#if defined(_ALLBSD_SOURCE) && defined(__amd64__)
++    sprintf(our_ld_paths,"%s/lib/%s/server:%s/lib/%s",jre,ARCH,jre,ARCH);
++#else
+     sprintf(our_ld_paths,"%s/lib/%s/client:%s/lib/%s",jre,ARCH,jre,ARCH);
++#endif
+ 
+     char * new_ld_lib_path;
+ 
diff --git a/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c b/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c
new file mode 100644
index 000000000000..fd5b16551898
--- /dev/null
+++ b/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c.orig	Thu Jul  6 17:10:12 2006
++++ ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c	Thu Jul  6 17:10:12 2006
+@@ -157,7 +157,7 @@
+     libjvm = dlopen(jvmpath, RTLD_NOW + RTLD_GLOBAL);
+   
+     if (libjvm == NULL) {
+-        snprintf(jvmpath, sizeof jvmpath, "%s/lib/"LIBARCH"/%s", java_home, libname);
++        snprintf(jvmpath, sizeof jvmpath, "%s/lib/"LIBARCH"/server/%s", java_home, libname);
+         libjvm = dlopen(jvmpath, RTLD_NOW + RTLD_GLOBAL);
+     }
+ 
diff --git a/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp b/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp
new file mode 100644
index 000000000000..6a44c9ce8011
--- /dev/null
+++ b/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp
@@ -0,0 +1,16 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp.orig	Thu Jun 15 18:08:03 2006
++++ ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp	Thu Jul  6 17:10:37 2006
+@@ -1289,7 +1289,11 @@
+   //          jre/lib/<arch>/classic/libjvm.so
+   // (to permit hotspot later).  So this path is only needed for 1.2
+ 
++#if defined(_ALLBSD_SOURCE) && defined(__amd64__)
++      sprintf(buff, "LD_LIBRARY_PATH=%s/lib/%s/server:%s/lib/%s",
++#else
+       sprintf(buff, "LD_LIBRARY_PATH=%s/lib/%s/client:%s/lib/%s",
++#endif
+               jre, LIBARCH,                // libjvm
+               jre, LIBARCH);               // libjava, libawt & friends
+ 
diff --git a/java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp b/java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
new file mode 100644
index 000000000000..78d8d258832f
--- /dev/null
+++ b/java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
@@ -0,0 +1,16 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp.orig	Tue Oct 19 15:04:42 2004
++++ ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp	Thu Jul  6 17:09:36 2006
+@@ -305,7 +305,11 @@
+     char * jre = m_ltstate->java_dir;
+     
+     // ARCH is passed in on the compile line
++#if defined(_ALLBSD_SOURCE) && defined(__amd64__)
++    sprintf(our_ld_paths,"%s/lib/%s/server:%s/lib/%s",jre,ARCH,jre,ARCH);
++#else
+     sprintf(our_ld_paths,"%s/lib/%s/client:%s/lib/%s",jre,ARCH,jre,ARCH);
++#endif
+ 
+     char * new_ld_lib_path;
+ 
diff --git a/java/jdk16/files/patch-deploy::jvm_exec::java_vm.c b/java/jdk16/files/patch-deploy::jvm_exec::java_vm.c
new file mode 100644
index 000000000000..fd5b16551898
--- /dev/null
+++ b/java/jdk16/files/patch-deploy::jvm_exec::java_vm.c
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c.orig	Thu Jul  6 17:10:12 2006
++++ ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c	Thu Jul  6 17:10:12 2006
+@@ -157,7 +157,7 @@
+     libjvm = dlopen(jvmpath, RTLD_NOW + RTLD_GLOBAL);
+   
+     if (libjvm == NULL) {
+-        snprintf(jvmpath, sizeof jvmpath, "%s/lib/"LIBARCH"/%s", java_home, libname);
++        snprintf(jvmpath, sizeof jvmpath, "%s/lib/"LIBARCH"/server/%s", java_home, libname);
+         libjvm = dlopen(jvmpath, RTLD_NOW + RTLD_GLOBAL);
+     }
+ 
diff --git a/java/jdk16/files/patch-deploy::nscore::JavaVM5.cpp b/java/jdk16/files/patch-deploy::nscore::JavaVM5.cpp
new file mode 100644
index 000000000000..6a44c9ce8011
--- /dev/null
+++ b/java/jdk16/files/patch-deploy::nscore::JavaVM5.cpp
@@ -0,0 +1,16 @@
+$FreeBSD$
+
+--- ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp.orig	Thu Jun 15 18:08:03 2006
++++ ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp	Thu Jul  6 17:10:37 2006
+@@ -1289,7 +1289,11 @@
+   //          jre/lib/<arch>/classic/libjvm.so
+   // (to permit hotspot later).  So this path is only needed for 1.2
+ 
++#if defined(_ALLBSD_SOURCE) && defined(__amd64__)
++      sprintf(buff, "LD_LIBRARY_PATH=%s/lib/%s/server:%s/lib/%s",
++#else
+       sprintf(buff, "LD_LIBRARY_PATH=%s/lib/%s/client:%s/lib/%s",
++#endif
+               jre, LIBARCH,                // libjvm
+               jre, LIBARCH);               // libjava, libawt & friends
+