summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2016-01-06 12:04:39 +0000
committerJay Freeman <saurik@saurik.com>2016-01-06 12:04:39 +0000
commit2ff680c0198901d585675ee5a972ddca4241e431 (patch)
tree5b33191e1485c2a2abc0c07259b4d48bee3d6412 /data
parent86291c55fb38d6ae8f8d1f0cb1a9b80f3e571f6a (diff)
Upgrade to JamVM 1.5.2 and fix GetVMs.
git-svn-id: http://svn.telesphoreo.org/trunk@815 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'data')
-rw-r--r--data/jamvm/_metadata/version2
-rw-r--r--data/jamvm/jamvm-1.5.1.tar.gzbin599084 -> 0 bytes
-rw-r--r--data/jamvm/jamvm-1.5.2.tgzbin0 -> 625844 bytes
-rw-r--r--data/jamvm/make.sh2
-rw-r--r--data/jamvm/ready.diff33
5 files changed, 35 insertions, 2 deletions
diff --git a/data/jamvm/_metadata/version b/data/jamvm/_metadata/version
index 7404b5d17..4cda8f19e 100644
--- a/data/jamvm/_metadata/version
+++ b/data/jamvm/_metadata/version
@@ -1 +1 @@
-1.5.1b2
+1.5.2
diff --git a/data/jamvm/jamvm-1.5.1.tar.gz b/data/jamvm/jamvm-1.5.1.tar.gz
deleted file mode 100644
index 771efb6ce..000000000
--- a/data/jamvm/jamvm-1.5.1.tar.gz
+++ /dev/null
Binary files differ
diff --git a/data/jamvm/jamvm-1.5.2.tgz b/data/jamvm/jamvm-1.5.2.tgz
new file mode 100644
index 000000000..fdd6f105f
--- /dev/null
+++ b/data/jamvm/jamvm-1.5.2.tgz
Binary files differ
diff --git a/data/jamvm/make.sh b/data/jamvm/make.sh
index 6eabcff9e..1e3afc97b 100644
--- a/data/jamvm/make.sh
+++ b/data/jamvm/make.sh
@@ -1,6 +1,6 @@
pkg:setup
#PKG_CONF=./autogen.sh
-pkg:configure --with-classpath-install-dir=/usr --enable-ffi=no
+PKG_MCPU=-marm pkg:configure --with-classpath-install-dir=/usr --enable-ffi=no
make with_classpath_install_dir="$(PKG_DEST_ classpath)/usr"
pkg:install
pkg: rm -rf /usr/include
diff --git a/data/jamvm/ready.diff b/data/jamvm/ready.diff
new file mode 100644
index 000000000..b3ca966ff
--- /dev/null
+++ b/data/jamvm/ready.diff
@@ -0,0 +1,33 @@
+diff -ru jamvm-1.5.1/src/jni.c jamvm-1.5.1+iPhone/src/jni.c
+--- jamvm-1.5.1/src/jni.c 2008-03-05 02:58:42.000000000 +0000
++++ jamvm-1.5.1+iPhone/src/jni.c 2016-01-06 11:02:02.000000000 +0000
+@@ -1306,10 +1306,13 @@
+ Jam_GetDirectBufferCapacity
+ };
+
++static int ready = 0;
++
+ jint Jam_DestroyJavaVM(JavaVM *vm) {
+ mainThreadWaitToExitVM();
+ exitVM(0);
+
++ ready = 0;
+ return JNI_OK;
+ }
+
+@@ -1537,10 +1540,15 @@
+ *penv = &env;
+ *pvm = &invokeIntf;
+
++ ready = 1;
+ return JNI_OK;
+ }
+
+ jint JNI_GetCreatedJavaVMs(JavaVM **buff, jsize buff_len, jsize *num) {
++ if(!ready) {
++ *num = 0;
++ return JNI_OK;
++ }
+ if(buff_len > 0) {
+ *buff = &invokeIntf;
+ *num = 1;