1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
|
From 276d44d8cbae597da5892fd64155c52f20453f6a Mon Sep 17 00:00:00 2001
From: yangfl <yangfl@users.noreply.github.com>
Date: Mon, 4 Jan 2021 23:07:33 +0800
Subject: [PATCH 5/8] unix/modjni: Try loading default-java
---
ports/unix/modjni.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index dbce61aec..817d3f32a 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -597,7 +597,10 @@ static void create_jvm(void) {
void *libjvm = dlopen(LIBJVM_SO, RTLD_NOW | RTLD_GLOBAL);
if (!libjvm) {
- mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("unable to load libjvm.so, use LD_LIBRARY_PATH"));
+ void *libjvm = dlopen("/usr/lib/jvm/default-java/lib/server/" LIBJVM_SO, RTLD_NOW | RTLD_GLOBAL);
+ if (!libjvm) {
+ mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("unable to load libjvm.so, use LD_LIBRARY_PATH"));
+ }
}
int (*_JNI_CreateJavaVM)(void *, void **, void *) = dlsym(libjvm, "JNI_CreateJavaVM");
--
2.47.2
|