[DRE-commits] [ruby-rjb] 01/01: Add a patch to provide the right libjvm.so location on i386

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository ruby-rjb.

commit 686ea47253a3db5de933110af49e28e416fd7ecb
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Wed Feb 24 13:31:35 2016 +0100

    Add a patch to provide the right libjvm.so location on i386
    
    Closes: #814411
---
 .../patches/0005-Always-JVM_TYPE-to-server.patch   | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0005-Always-JVM_TYPE-to-server.patch b/debian/patches/0005-Always-JVM_TYPE-to-server.patch
new file mode 100644
index 0000000..49d48ea
--- /dev/null
+++ b/debian/patches/0005-Always-JVM_TYPE-to-server.patch
@@ -0,0 +1,26 @@
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at 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 fb38a56..db6b617 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/series b/debian/patches/series
index 3ef6c44..687b4ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Fix-paths-to-jars-in-test-suite.patch
 0004-Use-an-method-that-always-returns-an-object-in-test_.patch
 0005-Fill-JAVA_HOME-with-a-sensible-value-if-not-set-when.patch
+0005-Always-JVM_TYPE-to-server.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rjb.git