tags 874146 + patch
thanks
Patch attached. :)
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` la...@debian.org / chris-lamb.co.uk
`-
commit 5a0e6250739773efbc176dbc93397c4fc2ebdae5
Author: Chris Lamb <la...@debian.org>
Date: Sun Apr 15 20:17:41 2018 +0100
Look for libjvm.so in /usr/lib/jvm/default-java/lib/server, not
/usr/lib/jvm/default-java/jre/lib/{i386,amd86}/client.
diff --git a/debian/patches/0005-Always-JVM_TYPE-to-server.patch
b/debian/patches/0005-Always-JVM_TYPE-to-server.patch
deleted file mode 100644
index 9cd9613..0000000
--- a/debian/patches/0005-Always-JVM_TYPE-to-server.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lu...@debian.org>
-Date: Wed, 24 Feb 2016 13:28:26 +0100
-Subject: Always JVM_TYPE to 'server'
-
-On Debian, libjvm.so is provided by the headless JRE which puts file
-in the 'server' directory and not 'client'. It used to work for amd64
-because there a curious special case.
-
-Closes: #814411
----
- ext/load.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/load.c b/ext/load.c
-index 44b13aa..eb48f48 100644
---- a/ext/load.c
-+++ b/ext/load.c
-@@ -32,7 +32,7 @@
- #include "jp_co_infoseek_hp_arton_rjb_RBridge.h"
- #include "rjb.h"
-
--#define JVM_TYPE "client"
-+#define JVM_TYPE "server"
- #define ALT_JVM_TYPE "classic"
-
- #if defined(_WIN32) || defined(__CYGWIN__)
diff --git
a/debian/patches/0006-Look-for-libjvm.so-in-usr-lib-jvm-default-java-lib-s.patch
b/debian/patches/0006-Look-for-libjvm.so-in-usr-lib-jvm-default-java-lib-s.patch
new file mode 100644
index 0000000..a934916
--- /dev/null
+++
b/debian/patches/0006-Look-for-libjvm.so-in-usr-lib-jvm-default-java-lib-s.patch
@@ -0,0 +1,40 @@
+From: Chris Lamb <la...@debian.org>
+Date: Sun, 15 Apr 2018 20:17:05 +0100
+Subject: Look for libjvm.so in /usr/lib/jvm/default-java/lib/server,
+ not /usr/lib/jvm/default-java/jre/lib/{i386,amd86}/client
+
+---
+ ext/load.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ext/load.c b/ext/load.c
+index 44b13aad69c2..ebd2c84c75e6 100644
+--- a/ext/load.c
++++ b/ext/load.c
+@@ -32,7 +32,7 @@
+ #include "jp_co_infoseek_hp_arton_rjb_RBridge.h"
+ #include "rjb.h"
+
+-#define JVM_TYPE "client"
++#define JVM_TYPE "server"
+ #define ALT_JVM_TYPE "classic"
+
+ #if defined(_WIN32) || defined(__CYGWIN__)
+@@ -83,7 +83,7 @@
+ #ifndef ARCH
+ #include <sys/systeminfo.h>
+ #endif
+- #define JVMDLL "%s/jre/lib/%s/%s/libjvm.so"
++ #define JVMDLL "%s/lib/%s/libjvm.so"
+ #define DIRSEPARATOR '/'
+ #define CLASSPATH_SEP ':'
+ #endif
+@@ -249,7 +249,7 @@ static int load_jvm(const char* jvmtype)
+ #else /* not Windows / MAC OS-X */
+ libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home)
+ + strlen(ARCH) + strlen(jvmtype) + 1);
+- sprintf(libpath, JVMDLL, java_home, ARCH, jvmtype);
++ sprintf(libpath, JVMDLL, java_home, jvmtype);
+ #endif
+ return open_jvm(libpath);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index bb0bf98..9616aea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
0001-Allow-bridge-file-to-be-specified-using-the-RJB_BRID.patch
0002-Fix-paths-to-jars-in-test-suite.patch
0005-Fill-JAVA_HOME-with-a-sensible-value-if-not-set-when.patch
-0005-Always-JVM_TYPE-to-server.patch
0005-Remove-support-for-obsolete-rake-gempackagetask.patch
+0006-Look-for-libjvm.so-in-usr-lib-jvm-default-java-lib-s.patch
