summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2011-03-31 19:00:59 +0200
committerPetr Mladek <pmladek@suse.cz>2011-04-01 14:19:44 +0200
commit8890bf7cd258b09be17a480cfdec0b66a40e22c8 (patch)
tree283989cfc468dadee2ee43d94c85b1c79db54111 /jvmfwk
parentd0a4422615b5338877529501e3072aa09bea49cf (diff)
jvmfwk-gij-paths.diff: more gij/libgcj paths
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx22
1 files changed, 21 insertions, 1 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 920020417d72..32f2792fbb93 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -51,7 +51,13 @@ char const* const* GnuInfo::getJavaExePaths(int * size)
{
static char const * ar[] = {
"gij",
- "bin/gij"
+ "bin/gij",
+ "gij-4.3",
+ "bin/gij-4.3",
+ "gij-4.2",
+ "bin/gij-4.2",
+ "gij-4.1",
+ "bin/gij-4.1"
};
*size = sizeof (ar) / sizeof (char*);
return ar;
@@ -69,6 +75,20 @@ char const* const* GnuInfo::getRuntimePaths(int * size)
"/libjvm.so",
"/lib/" GCJ_JFW_PLUGIN_ARCH "/client/libjvm.so",
"/gcj-4.1.1/libjvm.so",
+ "/gcj-4.3-90/libjvm.so",
+ "/gcj-4.2-81/libjvm.so",
+ "/gcj-4.2/libjvm.so",
+ "/gcj-4.2.1/libjvm.so",
+ "/gcj-4.2.2/libjvm.so",
+ "/gcj-4.2.3/libjvm.so",
+ "/gcj-4.1-71/libjvm.so",
+ "/gcj-4_1/libjvm.so",
+ "/gcj-4.1/libjvm.so",
+ "/libgcj.so.81",
+ "/libgcj.so.80",
+ "/libgcj.so.8",
+ "/libgcj.so.71",
+ "/libgcj.so.70",
"/libgcj.so.7",
"/libgcj.so.6"
};