mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

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

Browse Source 
Client VM.

Submitted by:	Kurt Miller <kurt@intricatesoftware.com>
This commit is contained in:
Greg Lewis 2006-07-18 23:23:02 +00:00
parent c9d5a55e98
commit 3e2f072bb5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=168176
6 changed files with 90 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp Normal file
View File

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

13
java/jdk15/files/patch-deploy::jvm_exec::java_vm.c Normal file
View File

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

16
java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp Normal file
View File

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

16
java/jdk16/files/patch-deploy::jcomponent::CPluginVM_OP.cpp Normal file
View File

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

13
java/jdk16/files/patch-deploy::jvm_exec::java_vm.c Normal file
View File

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

16
java/jdk16/files/patch-deploy::nscore::JavaVM5.cpp Normal file
View File

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