Go go JocStrap 2.0.

git-svn-id: http://svn.telesphoreo.org/trunk@368 514c082c-b64e-11dc-b46d-3d985efe055d

5 files changed, 18 insertions, 3 deletions

diff --git a/data/jocstrap/closures.diff b/data/jocstrap/closures.diff
new file mode 100644
index 000000000..fdba6d14c
--- /dev/null
+++ b/data/jocstrap/closures.diff
@@ -0,0 +1,15 @@
+diff -ru jocstrap-1.0.2474/jocstrap/source/joc/Runtime.m jocstrap-1.0.2474+iPhone/jocstrap/source/joc/Runtime.m
+--- jocstrap-1.0.2474/jocstrap/source/joc/Runtime.m	2008-07-14 02:07:50.000000000 +0000
++++ jocstrap-1.0.2474+iPhone/jocstrap/source/joc/Runtime.m	2008-07-14 04:36:25.000000000 +0000
+@@ -242,7 +242,11 @@
+         @throw joc_FromObject(env, error);
+ }
+ 
++#ifdef __OBJC2__
+ #define UseClosures false
++#else
++#define UseClosures true
++#endif
+ 
+ void ejprint(JNIEnv *env, jstring jvalue) {
+     const char *cvalue = (*(*env)->GetStringUTFChars)(env, jvalue, NULL);
diff --git a/data/jocstrap/jocstrap-1.0.2466.tgz b/data/jocstrap/jocstrap-1.0.2466.tgz
deleted file mode 100644
index effa6d34b..000000000
--- a/data/jocstrap/jocstrap-1.0.2466.tgz
+++ /dev/null
diff --git a/data/jocstrap/jocstrap-1.0.2474.tgz b/data/jocstrap/jocstrap-1.0.2474.tgz
new file mode 100644
index 000000000..e1395dd76
--- /dev/null
+++ b/data/jocstrap/jocstrap-1.0.2474.tgz
diff --git a/data/jocstrap/make.sh b/data/jocstrap/make.sh
index a9be213ed..e9c4b010a 100644
--- a/data/jocstrap/make.sh
+++ b/data/jocstrap/make.sh
@@ -1,7 +1,7 @@
-pkg:extract
-cd jocstrap-*
+pkg:setup
+cd jocstrap
 # XXX: omg this is stupid
-PKG_ROOT2=/apl/sys/ad8 make
+PKG_ROOT2=${PKG_BASE}/arch/${PKG_ARCH}/dumpable make
 pkg: mkdir -p /usr/include/joc /usr/lib /usr/share/java
 cp -a source/joc/*.h "${PKG_DEST}"/usr/include/joc
 pkg: cp -a libobjc-sig.dylib /usr/lib
diff --git a/data/jocstrap/minimal-2378.tgz b/data/jocstrap/minimal-2378.tgz
deleted file mode 100644
index 602860854..000000000
--- a/data/jocstrap/minimal-2378.tgz
+++ /dev/null