File: 0005-unix-modjni-Try-loading-default-java.patch

package info (click to toggle)
micropython 1.26.1%2Bds-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 50,196 kB
  • sloc: ansic: 324,551; python: 63,215; xml: 4,241; makefile: 3,618; sh: 1,586; javascript: 754; asm: 723; cpp: 83; exp: 11; pascal: 6
file content (28 lines) | stat: -rw-r--r-- 1,046 bytes parent folder | download | duplicates (2)
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